thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.672

Browse Source 
Problem:    When completing a shell command, directories in the current
            directory are not listed.
Solution:   When "." is not in $PATH also look in the current directory for
            directories.
This commit is contained in:
Bram Moolenaar
2015-03-21 17:32:19 +01:00
parent 4df702999d
commit b5971141df
13 changed files with 62 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/os_unix.c
View File

@@ -3104,22 +3104,27 @@ executable_file(name)
/*
* Return 1 if "name" can be found in $PATH and executed, 0 if not.
* If "use_path" is FALSE only check if "name" is executable.
* Return -1 if unknown.
*/
int
mch_can_exe(name, path)
mch_can_exe(name, path, use_path)
char_u *name;
char_u **path;
int use_path;
{
char_u *buf;
char_u *p, *e;
int retval;
/* If it's an absolute or relative path don't need to use $PATH. */
if (mch_isFullName(name) || (name[0] == '.' && (name[1] == '/'
|| (name[1] == '.' && name[2] == '/'))))
/* When "use_path" is false and if it's an absolute or relative path don't
* need to use $PATH. */
if (!use_path || mch_isFullName(name) || (name[0] == '.'
&& (name[1] == '/' || (name[1] == '.' && name[2] == '/'))))
{
if (executable_file(name))
/* There must be a path separator, files in the current directory
* can't be executed. */
if (gettail(name) != name && executable_file(name))
{
if (path != NULL)
{
@@ -5730,7 +5735,8 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags)
continue;
/* Skip files that are not executable if we check for that. */
if (!dir && (flags & EW_EXEC) && !mch_can_exe(p, NULL))
if (!dir && (flags & EW_EXEC)
&& !mch_can_exe(p, NULL, !(flags & EW_SHELLCMD)))
continue;
if (--files_free == 0)
@@ -6230,7 +6236,8 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags)
continue;
/* Skip files that are not executable if we check for that. */
if (!dir && (flags & EW_EXEC) && !mch_can_exe((*file)[i], NULL))
if (!dir && (flags & EW_EXEC)
&& !mch_can_exe((*file)[i], NULL, !(flags & EW_SHELLCMD)))
continue;
p = alloc((unsigned)(STRLEN((*file)[i]) + 1 + dir));