@ -1,6 +1,6 @@
--- a/lib/commands/toolcontext.c
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -1599 ,7 +1599 ,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
@@ -160 5,7 +160 5,7 @@ struct cmd_context *create_toolcontext(u
/* FIXME Make this configurable? */
/* FIXME Make this configurable? */
reset_lvm_errno(1);
reset_lvm_errno(1);
@ -9,7 +9,7 @@
/* Set in/out stream buffering before glibc */
/* Set in/out stream buffering before glibc */
if (set_buffering
if (set_buffering
#ifdef SYS_gettid
#ifdef SYS_gettid
@@ -1980,7 +1980,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
@@ -1986,7 +1986,7 @@ void destroy_toolcontext(struct cmd_cont
if (cmd->pending_delete_mem)
if (cmd->pending_delete_mem)
dm_pool_destroy(cmd->pending_delete_mem);
dm_pool_destroy(cmd->pending_delete_mem);
@ -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
@@ -3230,6 +3230,7 @@ int lvm_split(char *str, int *argc, char **argv, int max)
@@ -3241,6 +3241,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)
{
{
@ -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) &&
@@ -3256,6 +3257 ,12 @@ static int _check_standard_fds(void)
@@ -3267,6 +3268 ,12 @@ static int _check_standard_fds(void)
strerror(errno));
strerror(errno));
return 0;
return 0;
}
}