Permalink
Browse files

patch 8.1.0223: completing shell command finds sub-directories in $PATH

Problem:    Completing shell command finds sub-directories in $PATH.
Solution:   Remove EW_DIR when completing an item in $PATH. (Jason Franklin)
  • Loading branch information...
brammool committed Jul 28, 2018
1 parent 73b4aba commit 6ab9e429da18f4d784222a9f7dfafb7c0218b7eb
Showing with 43 additions and 13 deletions.
  1. +17 −12 src/ex_getln.c
  2. +24 −1 src/testdir/test_cmdline.vim
  3. +2 −0 src/version.c
@@ -5193,16 +5193,6 @@ expand_shellcmd(
hash_init(&found_ht);
for (s = path; ; s = e)
{
if (*s == NUL)
{
if (did_curdir)
break;
/* Find directories in the current directory, path is empty. */
did_curdir = TRUE;
}
else if (*s == '.')
did_curdir = TRUE;
#if defined(MSWIN)
e = vim_strchr(s, ';');
#else
@@ -5211,6 +5201,23 @@ expand_shellcmd(
if (e == NULL)
e = s + STRLEN(s);
if (*s == NUL)
{
if (did_curdir)
break;
// Find directories in the current directory, path is empty.
did_curdir = TRUE;
flags |= EW_DIR;
}
else if (STRNCMP(s, ".", (int)(e - s)) == 0)
{
did_curdir = TRUE;
flags |= EW_DIR;
}
else
// Do not match directories inside a $PATH item.
flags &= ~EW_DIR;
l = e - s;
if (l > MAXPATHL - 5)
break;
@@ -5266,8 +5273,6 @@ expand_shellcmd(
# if defined(FEAT_USR_CMDS) && defined(FEAT_EVAL)
static void * call_user_expand_func(void *(*user_expand_func)(char_u *, int, typval_T *, int), expand_T *xp, int *num_file, char_u ***file);
/*
* Call "user_expand_func()" to invoke a user defined Vim script function and
* return the result (either a string or a List).
@@ -231,7 +231,7 @@ func Test_getcompletion()
call assert_equal([], l)
let l = getcompletion('.', 'shellcmd')
call assert_equal(['./', '../'], l[0:1])
call assert_equal(['./', '../'], filter(l, 'v:val =~ "\\./"'))
call assert_equal(-1, match(l[2:], '^\.\.\?/$'))
let root = has('win32') ? 'C:\\' : '/'
let l = getcompletion(root, 'shellcmd')
@@ -290,6 +290,29 @@ func Test_getcompletion()
call assert_fails('call getcompletion("", "burp")', 'E475:')
endfunc
func Test_shellcmd_completion()
let save_path = $PATH
call mkdir('Xpathdir/Xpathsubdir', 'p')
call writefile([''], 'Xpathdir/Xfile.exe')
call setfperm('Xpathdir/Xfile.exe', 'rwx------')
" Set PATH to example directory without trailing slash.
let $PATH = getcwd() . '/Xpathdir'
" Test for the ":!<TAB>" case. Previously, this would include subdirs of
" dirs in the PATH, even though they won't be executed. We check that only
" subdirs of the PWD and executables from the PATH are included in the
" suggestions.
let actual = getcompletion('X', 'shellcmd')
let expected = map(filter(glob('*', 0, 1), 'isdirectory(v:val) && v:val[0] == "X"'), 'v:val . "/"')
call insert(expected, 'Xfile.exe')
call assert_equal(expected, actual)
call delete('Xpathdir', 'rf')
let $PATH = save_path
endfunc
func Test_expand_star_star()
call mkdir('a/b', 'p')
call writefile(['asdfasdf'], 'a/b/fileXname')
@@ -798,6 +798,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
223,
/**/
222,
/**/

0 comments on commit 6ab9e42

Please sign in to comment.