|
@ -1,7 +1,7 @@ |
|
|
--- a/lib/commands/toolcontext.c
|
|
|
--- a/lib/commands/toolcontext.c
|
|
|
+++ b/lib/commands/toolcontext.c
|
|
|
+++ b/lib/commands/toolcontext.c
|
|
|
@@ -1686,8 +1686,10 @@ struct cmd_context *create_toolcontext(u
|
|
|
|
|
|
unsigned threaded) |
|
|
|
|
|
|
|
|
@@ -1728,8 +1728,10 @@ struct cmd_context *create_toolcontext(u
|
|
|
|
|
|
unsigned set_filters) |
|
|
{ |
|
|
{ |
|
|
struct cmd_context *cmd; |
|
|
struct cmd_context *cmd; |
|
|
+#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
|
|
|
+#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
|
|
@ -11,7 +11,7 @@ |
|
|
|
|
|
|
|
|
#ifdef M_MMAP_MAX |
|
|
#ifdef M_MMAP_MAX |
|
|
mallopt(M_MMAP_MAX, 0); |
|
|
mallopt(M_MMAP_MAX, 0); |
|
|
@@ -1723,7 +1725,7 @@ struct cmd_context *create_toolcontext(u
|
|
|
|
|
|
|
|
|
@@ -1765,7 +1767,7 @@ struct cmd_context *create_toolcontext(u
|
|
|
/* FIXME Make this configurable? */ |
|
|
/* FIXME Make this configurable? */ |
|
|
reset_lvm_errno(1); |
|
|
reset_lvm_errno(1); |
|
|
|
|
|
|
|
@ -20,7 +20,7 @@ |
|
|
/* Set in/out stream buffering before glibc */ |
|
|
/* Set in/out stream buffering before glibc */ |
|
|
if (set_buffering) { |
|
|
if (set_buffering) { |
|
|
/* Allocate 2 buffers */ |
|
|
/* Allocate 2 buffers */ |
|
|
@@ -2096,7 +2098,7 @@ void destroy_toolcontext(struct cmd_cont
|
|
|
|
|
|
|
|
|
@@ -2148,7 +2150,7 @@ void destroy_toolcontext(struct cmd_cont
|
|
|
if (cmd->libmem) |
|
|
if (cmd->libmem) |
|
|
dm_pool_destroy(cmd->libmem); |
|
|
dm_pool_destroy(cmd->libmem); |
|
|
|
|
|
|
|
@ -31,7 +31,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
|
|
|
@@ -1722,6 +1722,7 @@ int lvm_split(char *str, int *argc, char
|
|
|
|
|
|
|
|
|
@@ -1735,6 +1735,7 @@ int lvm_split(char *str, int *argc, char
|
|
|
/* 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) |
|
|
{ |
|
|
{ |
|
@ -39,7 +39,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) && |
|
|
@@ -1748,6 +1749,12 @@ static int _check_standard_fds(void)
|
|
|
|
|
|
|
|
|
@@ -1761,6 +1762,12 @@ static int _check_standard_fds(void)
|
|
|
strerror(errno)); |
|
|
strerror(errno)); |
|
|
return 0; |
|
|
return 0; |
|
|
} |
|
|
} |
|
|