aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

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

Browse Source 
Problem:    Completing shell command finds sub-directories in $PATH.
Solution:   Remove EW_DIR when completing an item in $PATH. (Jason Franklin)
This commit is contained in:
Bram Moolenaar
2018-07-28 19:20:13 +02:00
parent 73b4abae5d
commit 6ab9e429da
3 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/ex_getln.c
View File

@@ -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).