|
@@ -1,6 +1,6 @@
|
1
|
1
|
--- a/lib/commands/toolcontext.c
|
2
|
2
|
+++ b/lib/commands/toolcontext.c
|
3
|
|
-@@ -1741,8 +1741,10 @@ struct cmd_context *create_toolcontext(u
|
|
3
|
+@@ -1747,8 +1747,10 @@ struct cmd_context *create_toolcontext(u
|
4
|
4
|
unsigned set_filters)
|
5
|
5
|
{
|
6
|
6
|
struct cmd_context *cmd;
|
|
@@ -11,7 +11,7 @@
|
11
|
11
|
|
12
|
12
|
#ifdef M_MMAP_MAX
|
13
|
13
|
mallopt(M_MMAP_MAX, 0);
|
14
|
|
-@@ -1778,7 +1780,7 @@ struct cmd_context *create_toolcontext(u
|
|
14
|
+@@ -1784,7 +1786,7 @@ struct cmd_context *create_toolcontext(u
|
15
|
15
|
/* FIXME Make this configurable? */
|
16
|
16
|
reset_lvm_errno(1);
|
17
|
17
|
|
|
@@ -20,7 +20,7 @@
|
20
|
20
|
/* Set in/out stream buffering before glibc */
|
21
|
21
|
if (set_buffering) {
|
22
|
22
|
/* Allocate 2 buffers */
|
23
|
|
-@@ -2161,7 +2163,7 @@ void destroy_toolcontext(struct cmd_cont
|
|
23
|
+@@ -2167,7 +2169,7 @@ void destroy_toolcontext(struct cmd_cont
|
24
|
24
|
if (cmd->libmem)
|
25
|
25
|
dm_pool_destroy(cmd->libmem);
|
26
|
26
|
|
|
@@ -31,7 +31,7 @@
|
31
|
31
|
if (is_valid_fd(STDIN_FILENO) &&
|
32
|
32
|
--- a/tools/lvmcmdline.c
|
33
|
33
|
+++ b/tools/lvmcmdline.c
|
34
|
|
-@@ -1741,6 +1741,7 @@ int lvm_split(char *str, int *argc, char
|
|
34
|
+@@ -1744,6 +1744,7 @@ int lvm_split(char *str, int *argc, char
|
35
|
35
|
/* Make sure we have always valid filedescriptors 0,1,2 */
|
36
|
36
|
static int _check_standard_fds(void)
|
37
|
37
|
{
|
|
@@ -39,7 +39,7 @@
|
39
|
39
|
int err = is_valid_fd(STDERR_FILENO);
|
40
|
40
|
|
41
|
41
|
if (!is_valid_fd(STDIN_FILENO) &&
|
42
|
|
-@@ -1767,6 +1768,12 @@ static int _check_standard_fds(void)
|
|
42
|
+@@ -1770,6 +1771,12 @@ static int _check_standard_fds(void)
|
43
|
43
|
strerror(errno));
|
44
|
44
|
return 0;
|
45
|
45
|
}
|