1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Sat, 25 Apr 2015 23:34:05 +0200
Subject: [PATCH] const-stdio: guard glibc-specific stream buffering behind
__GLIBC__
create_toolcontext()/destroy_toolcontext() tune glibc's stdio stream
buffering directly via glibc-only internals; _check_standard_fds() has
a musl-compatible fallback path already available. Wrap the
glibc-specific code in #ifdef __GLIBC__ so this builds against musl.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
lib/commands/toolcontext.c | 4 ++++
tools/lvmcmdline.c | 7 +++++++
2 files changed, 11 insertions(+)
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -1666,6 +1666,7 @@ struct cmd_context *create_toolcontext(c
/* FIXME Make this configurable? */
reset_lvm_errno(1);
+#ifdef __GLIBC__
/* Set in/out stream buffering before glibc */
if (set_buffering
&& !cmd->running_on_valgrind /* Skipping within valgrind execution. */
@@ -1710,6 +1711,7 @@ struct cmd_context *create_toolcontext(c
} else if (!set_buffering)
/* Without buffering, must not use stdin/stdout */
init_silent(1);
+#endif
/*
* Environment variable LVM_SYSTEM_DIR overrides this below.
@@ -2048,6 +2050,7 @@ void destroy_toolcontext(struct cmd_cont
if (cmd->cft_def_hash)
dm_hash_destroy(cmd->cft_def_hash);
+#ifdef __GLIBC__
if (!cmd->running_on_valgrind && cmd->linebuffer) {
int flags;
/* Reset stream buffering to defaults */
@@ -2071,6 +2074,7 @@ void destroy_toolcontext(struct cmd_cont
free(cmd->linebuffer);
}
+#endif
destroy_config_context(cmd);
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -3395,6 +3395,7 @@ int lvm_split(char *str, int *argc, char
/* Make sure we have always valid filedescriptors 0,1,2 */
static int _check_standard_fds(void)
{
+#ifdef __GLIBC__
int err = is_valid_fd(STDERR_FILENO);
if (!is_valid_fd(STDIN_FILENO) &&
@@ -3421,6 +3422,12 @@ static int _check_standard_fds(void)
strerror(errno));
return 0;
}
+#else
+ if (!is_valid_fd(STDERR_FILENO) ||
+ !is_valid_fd(STDOUT_FILENO) ||
+ !is_valid_fd(STDIN_FILENO))
+ return 0;
+#endif
return 1;
}
|
