From 65a04547541894b3ec56bd70510b164810cd64b3 Mon Sep 17 00:00:00 2001 From: Dengke Du 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 Signed-off-by: Dengke Du 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 90905e629..ed69662d0 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 22ae1e3bb..b0928bc04 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -3407,7 +3407,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 @@ -3417,7 +3417,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 */ @@ -3425,7 +3425,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;