|
@@ -1,8 +1,8 @@
|
1
|
|
-Index: LVM2.2.02.118/lib/commands/toolcontext.c
|
|
1
|
+Index: LVM2.2.02.120/lib/commands/toolcontext.c
|
2
|
2
|
===================================================================
|
3
|
|
---- LVM2.2.02.118.orig/lib/commands/toolcontext.c
|
4
|
|
-+++ LVM2.2.02.118/lib/commands/toolcontext.c
|
5
|
|
-@@ -1625,8 +1625,10 @@ struct cmd_context *create_toolcontext(u
|
|
3
|
+--- LVM2.2.02.120.orig/lib/commands/toolcontext.c
|
|
4
|
++++ LVM2.2.02.120/lib/commands/toolcontext.c
|
|
5
|
+@@ -1637,8 +1637,10 @@ struct cmd_context *create_toolcontext(u
|
6
|
6
|
unsigned threaded)
|
7
|
7
|
{
|
8
|
8
|
struct cmd_context *cmd;
|
|
@@ -13,7 +13,7 @@ Index: LVM2.2.02.118/lib/commands/toolcontext.c
|
13
|
13
|
|
14
|
14
|
#ifdef M_MMAP_MAX
|
15
|
15
|
mallopt(M_MMAP_MAX, 0);
|
16
|
|
-@@ -1662,7 +1664,7 @@ struct cmd_context *create_toolcontext(u
|
|
16
|
+@@ -1674,7 +1676,7 @@ struct cmd_context *create_toolcontext(u
|
17
|
17
|
/* FIXME Make this configurable? */
|
18
|
18
|
reset_lvm_errno(1);
|
19
|
19
|
|
|
@@ -22,7 +22,7 @@ Index: LVM2.2.02.118/lib/commands/toolcontext.c
|
22
|
22
|
/* Set in/out stream buffering before glibc */
|
23
|
23
|
if (set_buffering) {
|
24
|
24
|
/* Allocate 2 buffers */
|
25
|
|
-@@ -2035,7 +2037,7 @@ void destroy_toolcontext(struct cmd_cont
|
|
25
|
+@@ -2047,7 +2049,7 @@ void destroy_toolcontext(struct cmd_cont
|
26
|
26
|
if (cmd->libmem)
|
27
|
27
|
dm_pool_destroy(cmd->libmem);
|
28
|
28
|
|
|
@@ -31,11 +31,11 @@ Index: LVM2.2.02.118/lib/commands/toolcontext.c
|
31
|
31
|
if (cmd->linebuffer) {
|
32
|
32
|
/* Reset stream buffering to defaults */
|
33
|
33
|
if (is_valid_fd(STDIN_FILENO) &&
|
34
|
|
-Index: LVM2.2.02.118/tools/lvmcmdline.c
|
|
34
|
+Index: LVM2.2.02.120/tools/lvmcmdline.c
|
35
|
35
|
===================================================================
|
36
|
|
---- LVM2.2.02.118.orig/tools/lvmcmdline.c
|
37
|
|
-+++ LVM2.2.02.118/tools/lvmcmdline.c
|
38
|
|
-@@ -1602,6 +1602,7 @@ int lvm_split(char *str, int *argc, char
|
|
36
|
+--- LVM2.2.02.120.orig/tools/lvmcmdline.c
|
|
37
|
++++ LVM2.2.02.120/tools/lvmcmdline.c
|
|
38
|
+@@ -1606,6 +1606,7 @@ int lvm_split(char *str, int *argc, char
|
39
|
39
|
/* Make sure we have always valid filedescriptors 0,1,2 */
|
40
|
40
|
static int _check_standard_fds(void)
|
41
|
41
|
{
|
|
@@ -43,7 +43,7 @@ Index: LVM2.2.02.118/tools/lvmcmdline.c
|
43
|
43
|
int err = is_valid_fd(STDERR_FILENO);
|
44
|
44
|
|
45
|
45
|
if (!is_valid_fd(STDIN_FILENO) &&
|
46
|
|
-@@ -1628,6 +1629,12 @@ static int _check_standard_fds(void)
|
|
46
|
+@@ -1632,6 +1633,12 @@ static int _check_standard_fds(void)
|
47
|
47
|
strerror(errno));
|
48
|
48
|
return 0;
|
49
|
49
|
}
|