mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-14 17:59:59 +00:00
Wang Mingyu
ee26b51856
0001-implement-libc-specific-reopen_stream.patch 0001-include-libgen.h-for-basename.patch refreshed for 2.03.25 Changelog: ============= - Utilize more radix_tree instead of dm_hash and btree. - Refactor DM uuid caching from device_mapper directory. - Enhance checking for DM uuid device. - Fix lvm shell command completion on tab key (2.03.24). - Avoid lockd_vg call to lvmlockd for local VGs. - Allow forced change of locktype from none. - Handle OPTIONS defined in /etc/sysconfig/lvmlockd. Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
78 lines
2.3 KiB
Diff
78 lines
2.3 KiB
Diff
From e2f24ea066e6dfb9f13f623009034acbf4ae8818 Mon Sep 17 00:00:00 2001
|
|
From: Dengke Du <dengke.du@windriver.com>
|
|
Date: Tue, 25 Oct 2016 11:49:40 +0000
|
|
Subject: [PATCH] implement libc specific reopen_stream
|
|
|
|
musl defines stdin/stdio/stderr as constant types which means
|
|
we can not assign to them as we are doing here but works ok with glibc
|
|
therefore abstract out the _reopen_stream definition depending upon if
|
|
we are using glibc or otherwise
|
|
|
|
Origin:
|
|
http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
Signed-off-by: Dengke Du <dengke.du@windriver.com>
|
|
|
|
Upstream-Status: Pending
|
|
---
|
|
lib/log/log.c | 6 ++++++
|
|
tools/lvmcmdline.c | 6 +++---
|
|
2 files changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/lib/log/log.c b/lib/log/log.c
|
|
index eafb3ef1c..ff3d751bf 100644
|
|
--- a/lib/log/log.c
|
|
+++ b/lib/log/log.c
|
|
@@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_
|
|
* Close and reopen standard stream on file descriptor fd.
|
|
*/
|
|
int reopen_standard_stream(FILE **stream, const char *mode)
|
|
+#ifdef __GLIBC__
|
|
{
|
|
int fd, fd_copy, new_fd;
|
|
const char *name;
|
|
@@ -211,6 +212,11 @@ int reopen_standard_stream(FILE **stream, const char *mode)
|
|
*stream = new_stream;
|
|
return 1;
|
|
}
|
|
+#else
|
|
+{
|
|
+ return (freopen(NULL, mode, *stream) != NULL);
|
|
+}
|
|
+#endif
|
|
|
|
void init_log_fn(lvm2_log_fn_t log_fn)
|
|
{
|
|
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
|
|
index 1b2f7f47c..e0674d42d 100644
|
|
--- a/tools/lvmcmdline.c
|
|
+++ b/tools/lvmcmdline.c
|
|
@@ -3378,7 +3378,7 @@ static int _check_standard_fds(void)
|
|
int err = is_valid_fd(STDERR_FILENO);
|
|
|
|
if (!is_valid_fd(STDIN_FILENO) &&
|
|
- !(stdin = fopen(_PATH_DEVNULL, "r"))) {
|
|
+ !freopen(_PATH_DEVNULL, "r", stdin)) {
|
|
if (err)
|
|
perror("stdin stream open");
|
|
else
|
|
@@ -3388,7 +3388,7 @@ static int _check_standard_fds(void)
|
|
}
|
|
|
|
if (!is_valid_fd(STDOUT_FILENO) &&
|
|
- !(stdout = fopen(_PATH_DEVNULL, "w"))) {
|
|
+ !freopen(_PATH_DEVNULL, "w", stdout)) {
|
|
if (err)
|
|
perror("stdout stream open");
|
|
/* else no stdout */
|
|
@@ -3396,7 +3396,7 @@ static int _check_standard_fds(void)
|
|
}
|
|
|
|
if (!is_valid_fd(STDERR_FILENO) &&
|
|
- !(stderr = fopen(_PATH_DEVNULL, "w"))) {
|
|
+ !freopen(_PATH_DEVNULL, "w", stderr)) {
|
|
printf("stderr stream open: %s\n",
|
|
strerror(errno));
|
|
return 0;
|