Mercurial > vim
changeset 31020:b0596e8ee3c0 v9.0.0845
patch 9.0.0845: shell command with just space gives strange error
Commit: https://github.com/vim/vim/commit/4e7590ec00483077daaa567aa2220bc8df912f3c
Author: shane.xb.qian <shane.qian@foxmail.com>
Date: Tue Nov 8 21:40:04 2022 +0000
patch 9.0.0845: shell command with just space gives strange error
Problem: Shell command with just space gives strange error.
Solution: Skip white space at start of the argument. (Christian Brabandt,
Shane-XB-Qian, closes #11515, closes #11495)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 08 Nov 2022 22:45:04 +0100 |
| parents | 3cee244c9363 |
| children | 57cf55d34f57 |
| files | src/ex_cmds.c src/testdir/test_cmdline.vim src/version.c |
| diffstat | 3 files changed, 54 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -899,11 +899,13 @@ do_bang( } /* - * Try to find an embedded bang, like in :!<cmd> ! [args] - * (:!! is indicated by the 'forceit' variable) + * Try to find an embedded bang, like in ":!<cmd> ! [args]" + * ":!!" is indicated by the 'forceit' variable. */ ins_prevcmd = forceit; - trailarg = arg; + + // Skip leading white space to avoid a strange error with some shells. + trailarg = skipwhite(arg); do { len = (int)STRLEN(trailarg) + 1;
--- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -1653,6 +1653,53 @@ func Test_cmd_bang_E135() %bwipe! endfunc +func Test_cmd_bang_args() + new + :.! + call assert_equal(0, v:shell_error) + + " Note that below there is one space char after the '!'. This caused a + " shell error in the past, see https://github.com/vim/vim/issues/11495. + :.! + call assert_equal(0, v:shell_error) + bwipe! + + CheckUnix + :.!pwd + call assert_equal(0, v:shell_error) + :.! pwd + call assert_equal(0, v:shell_error) + + " Note there is one space after 'pwd'. + :.! pwd + call assert_equal(0, v:shell_error) + + " Note there are two spaces after 'pwd'. + :.! pwd + call assert_equal(0, v:shell_error) + :.!ls ~ + call assert_equal(0, v:shell_error) + + " Note there is one space char after '~'. + :.!ls ~ + call assert_equal(0, v:shell_error) + + " Note there are two spaces after '~'. + :.!ls ~ + call assert_equal(0, v:shell_error) + + :.!echo "foo" + call assert_equal(getline('.'), "foo") + :.!echo "foo " + call assert_equal(getline('.'), "foo ") + :.!echo " foo " + call assert_equal(getline('.'), " foo ") + :.!echo " foo " + call assert_equal(getline('.'), " foo ") + + %bwipe! +endfunc + " Test for using ~ for home directory in cmdline completion matches func Test_cmdline_expand_home() call mkdir('Xexpdir', 'R')