|
@ -1,15 +1,15 @@ |
|
|
--- a/lib/commands/toolcontext.c
|
|
|
--- a/lib/commands/toolcontext.c
|
|
|
+++ b/lib/commands/toolcontext.c
|
|
|
+++ b/lib/commands/toolcontext.c
|
|
|
@@ -1869,7 +1869,7 @@ struct cmd_context *create_toolcontext(u
|
|
|
|
|
|
|
|
|
@@ -1860,7 +1860,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
|
|
|
/* FIXME Make this configurable? */ |
|
|
/* FIXME Make this configurable? */ |
|
|
reset_lvm_errno(1); |
|
|
reset_lvm_errno(1); |
|
|
|
|
|
|
|
|
-#ifndef VALGRIND_POOL
|
|
|
-#ifndef VALGRIND_POOL
|
|
|
+#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
|
|
|
+#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
|
|
|
/* Set in/out stream buffering before glibc */ |
|
|
/* Set in/out stream buffering before glibc */ |
|
|
if (set_buffering) { |
|
|
|
|
|
/* Allocate 2 buffers */ |
|
|
|
|
|
@@ -2249,7 +2249,7 @@ void destroy_toolcontext(struct cmd_cont
|
|
|
|
|
|
|
|
|
if (set_buffering |
|
|
|
|
|
#ifdef SYS_gettid |
|
|
|
|
|
@@ -2254,7 +2254,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
|
|
|
if (cmd->libmem) |
|
|
if (cmd->libmem) |
|
|
dm_pool_destroy(cmd->libmem); |
|
|
dm_pool_destroy(cmd->libmem); |
|
|
|
|
|
|
|
@ -20,7 +20,7 @@ |
|
|
if (is_valid_fd(STDIN_FILENO) && |
|
|
if (is_valid_fd(STDIN_FILENO) && |
|
|
--- a/tools/lvmcmdline.c
|
|
|
--- a/tools/lvmcmdline.c
|
|
|
+++ b/tools/lvmcmdline.c
|
|
|
+++ b/tools/lvmcmdline.c
|
|
|
@@ -3074,6 +3074,7 @@ int lvm_split(char *str, int *argc, char
|
|
|
|
|
|
|
|
|
@@ -3109,6 +3109,7 @@ int lvm_split(char *str, int *argc, char **argv, int max)
|
|
|
/* Make sure we have always valid filedescriptors 0,1,2 */ |
|
|
/* Make sure we have always valid filedescriptors 0,1,2 */ |
|
|
static int _check_standard_fds(void) |
|
|
static int _check_standard_fds(void) |
|
|
{ |
|
|
{ |
|
@ -28,7 +28,7 @@ |
|
|
int err = is_valid_fd(STDERR_FILENO); |
|
|
int err = is_valid_fd(STDERR_FILENO); |
|
|
|
|
|
|
|
|
if (!is_valid_fd(STDIN_FILENO) && |
|
|
if (!is_valid_fd(STDIN_FILENO) && |
|
|
@@ -3100,6 +3101,12 @@ static int _check_standard_fds(void)
|
|
|
|
|
|
|
|
|
@@ -3135,6 +3136,12 @@ static int _check_standard_fds(void)
|
|
|
strerror(errno)); |
|
|
strerror(errno)); |
|
|
return 0; |
|
|
return 0; |
|
|
} |
|
|
} |
|
|