1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
To: vim_dev@googlegroups.com
Subject: Patch 7.3.269
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.3.269
Problem: 'shellcmdflag' only works with one flag.
Solution: Split into multiple arguments. (Gary Johnson)
Files: src/os_unix.c
*** ../vim-7.3.268/src/os_unix.c 2011-08-04 19:36:47.000000000 +0200
--- src/os_unix.c 2011-08-04 20:27:13.000000000 +0200
***************
*** 3795,3802 ****
--- 3795,3804 ----
int retval = -1;
char **argv = NULL;
int argc;
+ char_u *p_shcf_copy = NULL;
int i;
char_u *p;
+ char_u *s;
int inquote;
int pty_master_fd = -1; /* for pty's */
# ifdef FEAT_GUI
***************
*** 3855,3860 ****
--- 3857,3875 ----
}
if (argv == NULL)
{
+ /*
+ * Account for possible multiple args in p_shcf.
+ */
+ p = p_shcf;
+ for (;;)
+ {
+ p = skiptowhite(p);
+ if (*p == NUL)
+ break;
+ ++argc;
+ p = skipwhite(p);
+ }
+
argv = (char **)alloc((unsigned)((argc + 4) * sizeof(char *)));
if (argv == NULL) /* out of memory */
goto error;
***************
*** 3864,3870 ****
{
if (extra_shell_arg != NULL)
argv[argc++] = (char *)extra_shell_arg;
! argv[argc++] = (char *)p_shcf;
argv[argc++] = (char *)cmd;
}
argv[argc] = NULL;
--- 3879,3901 ----
{
if (extra_shell_arg != NULL)
argv[argc++] = (char *)extra_shell_arg;
!
! /* Break 'shellcmdflag' into white separated parts. This doesn't
! * handle quoted strings, they are very unlikely to appear. */
! p_shcf_copy = alloc((unsigned)STRLEN(p_shcf) + 1);
! if (p_shcf_copy == NULL) /* out of memory */
! goto error;
! s = p_shcf_copy;
! p = p_shcf;
! while (*p != NUL)
! {
! argv[argc++] = (char *)s;
! while (*p && *p != ' ' && *p != TAB)
! *s++ = *p++;
! *s++ = NUL;
! p = skipwhite(p);
! }
!
argv[argc++] = (char *)cmd;
}
argv[argc] = NULL;
***************
*** 4677,4682 ****
--- 4708,4714 ----
}
}
vim_free(argv);
+ vim_free(p_shcf_copy);
error:
if (!did_settmode)
*** ../vim-7.3.268/src/version.c 2011-08-04 19:36:47.000000000 +0200
--- src/version.c 2011-08-04 20:30:44.000000000 +0200
***************
*** 711,712 ****
--- 711,714 ----
{ /* Add new patch number below this line */
+ /**/
+ 269,
/**/
--
Be nice to your kids... they'll be the ones choosing your nursing home.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
