Commit 3e1ca9a2 authored by KillTheMule's avatar KillTheMule

Linting.

parent 00c35ab3
......@@ -4017,20 +4017,19 @@ static void expand_shellcmd(char_u *filepat, int *num_file, char_u ***file,
*/
ga_init(&ga, (int)sizeof(char *), 10);
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 (*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 (*s == ' ')
++s; /* Skip space used for absolute path name. */
if (*s == ' ') {
s++; // Skip space used for absolute path name.
}
e = vim_strchr(s, ':');
if (e == NULL)
......
......@@ -576,10 +576,11 @@ int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file,
if ((dir && !(flags & EW_DIR)) || (!dir && !(flags & EW_FILE)))
continue;
/* Skip files that are not executable if we check for that. */
// Skip files that are not executable if we check for that.
if (!dir && (flags & EW_EXEC)
&& !os_can_exe((*file)[i], NULL, !(flags & EW_SHELLCMD)))
&& !os_can_exe((*file)[i], NULL, !(flags & EW_SHELLCMD))) {
continue;
}
p = xmalloc(STRLEN((*file)[i]) + 1 + dir);
STRCPY(p, (*file)[i]);
......
......@@ -1321,8 +1321,9 @@ void addfile(
// If the file isn't executable, may not add it. Do accept directories.
// When invoked from expand_shellcmd() do not use $PATH.
if (!isdir && (flags & EW_EXEC)
&& !os_can_exe(f, NULL, !(flags & EW_SHELLCMD)))
&& !os_can_exe(f, NULL, !(flags & EW_SHELLCMD))) {
return;
}
char_u *p = xmalloc(STRLEN(f) + 1 + isdir);
......
......@@ -22,7 +22,7 @@
* is used when executing commands and EW_SILENT for interactive expanding. */
#define EW_ALLLINKS 0x1000 // also links not pointing to existing file
#define EW_SHELLCMD 0x2000 // called from expand_shellcmd(), don't check
// if executable is in $PATH
// if executable is in $PATH
#define EW_DODOT 0x4000 // also files starting with a dot
#define EW_EMPTYOK 0x8000 // no matches is not an error
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment