1From e3103459416616d3b8508e7176e897b0ae6c90f2 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com>
3Date: Tue, 25 Oct 2016 11:49:40 +0000
4Subject: [PATCH] implement libc specific reopen_stream
5
6musl defines stdin/stdio/stderr as constant types which means
7we can not assign to them as we are doing here but works ok with glibc
8therefore abstract out the _reopen_stream definition depending upon if
9we are using glibc or otherwise
10
11Origin:
12http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15Signed-off-by: Dengke Du <dengke.du@windriver.com>
16
17---
18 lib/log/log.c      | 6 ++++++
19 tools/lvmcmdline.c | 6 +++---
20 2 files changed, 9 insertions(+), 3 deletions(-)
21
22Index: LVM2.2.02.177/lib/log/log.c
23===================================================================
24--- LVM2.2.02.177.orig/lib/log/log.c
25+++ LVM2.2.02.177/lib/log/log.c
26@@ -161,6 +161,7 @@ static void _check_and_replace_standard_
27  * Close and reopen standard stream on file descriptor fd.
28  */
29 int reopen_standard_stream(FILE **stream, const char *mode)
30+#ifdef __GLIBC__
31 {
32 	int fd, fd_copy, new_fd;
33 	const char *name;
34@@ -207,6 +208,11 @@ int reopen_standard_stream(FILE **stream
35 	*stream = new_stream;
36 	return 1;
37 }
38+#else
39+{
40+	return (freopen(NULL, mode, *stream) != NULL);
41+}
42+#endif
43
44 void init_log_fn(lvm2_log_fn_t log_fn)
45 {
46Index: LVM2.2.02.177/tools/lvmcmdline.c
47===================================================================
48--- LVM2.2.02.177.orig/tools/lvmcmdline.c
49+++ LVM2.2.02.177/tools/lvmcmdline.c
50@@ -3095,7 +3095,7 @@ static int _check_standard_fds(void)
51 	int err = is_valid_fd(STDERR_FILENO);
52
53 	if (!is_valid_fd(STDIN_FILENO) &&
54-	    !(stdin = fopen(_PATH_DEVNULL, "r"))) {
55+	    !freopen(_PATH_DEVNULL, "r", stdin)) {
56 		if (err)
57 			perror("stdin stream open");
58 		else
59@@ -3105,7 +3105,7 @@ static int _check_standard_fds(void)
60 	}
61
62 	if (!is_valid_fd(STDOUT_FILENO) &&
63-	    !(stdout = fopen(_PATH_DEVNULL, "w"))) {
64+	    !freopen(_PATH_DEVNULL, "w", stdout)) {
65 		if (err)
66 			perror("stdout stream open");
67 		/* else no stdout */
68@@ -3113,7 +3113,7 @@ static int _check_standard_fds(void)
69 	}
70
71 	if (!is_valid_fd(STDERR_FILENO) &&
72-	    !(stderr = fopen(_PATH_DEVNULL, "w"))) {
73+	    !freopen(_PATH_DEVNULL, "w", stderr)) {
74 		printf("stderr stream open: %s\n",
75 		       strerror(errno));
76 		return 0;
77