Mercurial > vim
changeset 2135:7aee5e68548a v7.2.417
updated for version 7.2.417
Problem: When 'shell' has an argument with a slash then 'shellpipe' is not
set properly. (Britton Kerin)
Solution: Assume there are no spaces in the path, arguments follow.
| author | Bram Moolenaar <bram@zimbu.org> |
|---|---|
| date | Thu, 13 May 2010 13:12:06 +0200 |
| parents | e9c9f37be306 |
| children | 431ebc9412a8 |
| files | src/option.c src/version.c |
| diffstat | 2 files changed, 25 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/option.c +++ b/src/option.c @@ -3696,9 +3696,32 @@ set_init_3() * Isolate the name of the shell: * - Skip beyond any path. E.g., "/usr/bin/csh -f" -> "csh -f". * - Remove any argument. E.g., "csh -f" -> "csh". + * But don't allow a space in the path, so that this works: + * "/usr/bin/csh --rcfile ~/.cshrc" + * But don't do that for Windows, it's common to have a space in the path. */ +#ifdef WIN3264 p = gettail(p_sh); p = vim_strnsave(p, (int)(skiptowhite(p) - p)); +#else + p = skiptowhite(p_sh); + if (*p == NUL) + { + /* No white space, use the tail. */ + p = vim_strsave(gettail(p_sh)); + } + else + { + char_u *p1, *p2; + + /* Find the last path separator before the space. */ + p1 = p_sh; + for (p2 = p_sh; p2 < p; mb_ptr_adv(p2)) + if (vim_ispathsep(*p2)) + p1 = p2 + 1; + p = vim_strnsave(p1, (int)(p - p1)); + } +#endif if (p != NULL) { /*