diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-02-20 22:18:30 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-02-20 22:18:30 +0100 |
| commit | f66b3fcf6ce2801e3f378827e0ed19596901a9ba (patch) | |
| tree | 46a1543aae183a8b03ce18b3572d57e04656e3f2 /src/misc2.c | |
| parent | 034b115568a1fc40b374b0b755d89f0a40f6d940 (diff) | |
| download | vim-f66b3fcf6ce2801e3f378827e0ed19596901a9ba.zip | |
updated for version 7.3.446
Problem: Win32: External commands with special characters don't work.
Solution: Add the 'shellxescape' option.
Diffstat (limited to 'src/misc2.c')
| -rw-r--r-- | src/misc2.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/misc2.c b/src/misc2.c index fc38cd029..045117fe0 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -3225,11 +3225,19 @@ call_shell(cmd, opt) retval = mch_call_shell(cmd, opt); else { - ncmd = alloc((unsigned)(STRLEN(cmd) + STRLEN(p_sxq) * 2 + 1)); + char_u *ecmd = cmd; + + if (*p_sxe != NUL && STRCMP(p_sxq, "(") == 0) + { + ecmd = vim_strsave_escaped_ext(cmd, p_sxe, '^', FALSE); + if (ecmd == NULL) + ecmd = cmd; + } + ncmd = alloc((unsigned)(STRLEN(ecmd) + STRLEN(p_sxq) * 2 + 1)); if (ncmd != NULL) { STRCPY(ncmd, p_sxq); - STRCAT(ncmd, cmd); + STRCAT(ncmd, ecmd); /* When 'shellxquote' is ( append ). * When 'shellxquote' is "( append )". */ STRCAT(ncmd, STRCMP(p_sxq, "(") == 0 ? (char_u *)")" @@ -3240,6 +3248,8 @@ call_shell(cmd, opt) } else retval = -1; + if (ecmd != cmd) + vim_free(ecmd); } #ifdef FEAT_GUI --hold_gui_events; |