mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-15 07:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Linting.

Browse Source
This commit is contained in:
KillTheMule
2016-05-01 21:06:47 +02:00
parent 00c35ab3b4
commit 3e1ca9a2db
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/nvim/ex_getln.c
View File

@@ -4017,20 +4017,19 @@ static void expand_shellcmd(char_u *filepat, int *num_file, char_u ***file,
*/ */
ga_init(&ga, (int)sizeof(char *), 10); ga_init(&ga, (int)sizeof(char *), 10);
for (s = path; ; s = e) { for (s = path; ; s = e) {
if (*s == NUL) if (*s == NUL) {
{ if (did_curdir) {
if (did_curdir) { break;
break; }
} // Find directories in the current directory, path is empty.
// Find directories in the current directory, path is empty. did_curdir = true;
did_curdir = true; } else if (*s == '.') {
} did_curdir = true;
else if (*s == '.') {
did_curdir = true;
} }
if (*s == ' ') if (*s == ' ') {
++s; /* Skip space used for absolute path name. */ s++; // Skip space used for absolute path name.
}
e = vim_strchr(s, ':'); e = vim_strchr(s, ':');
if (e == NULL) if (e == NULL)

5
src/nvim/os_unix.c
View File

@@ -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))) if ((dir && !(flags & EW_DIR)) || (!dir && !(flags & EW_FILE)))
continue; 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) if (!dir && (flags & EW_EXEC)
&& !os_can_exe((*file)[i], NULL, !(flags & EW_SHELLCMD))) && !os_can_exe((*file)[i], NULL, !(flags & EW_SHELLCMD))) {
continue; continue;
}
p = xmalloc(STRLEN((*file)[i]) + 1 + dir); p = xmalloc(STRLEN((*file)[i]) + 1 + dir);
STRCPY(p, (*file)[i]); STRCPY(p, (*file)[i]);

3
src/nvim/path.c
View File

@@ -1321,8 +1321,9 @@ void addfile(
// If the file isn't executable, may not add it. Do accept directories. // If the file isn't executable, may not add it. Do accept directories.
// When invoked from expand_shellcmd() do not use $PATH. // When invoked from expand_shellcmd() do not use $PATH.
if (!isdir && (flags & EW_EXEC) if (!isdir && (flags & EW_EXEC)
&& !os_can_exe(f, NULL, !(flags & EW_SHELLCMD))) && !os_can_exe(f, NULL, !(flags & EW_SHELLCMD))) {
return; return;
}
char_u *p = xmalloc(STRLEN(f) + 1 + isdir); char_u *p = xmalloc(STRLEN(f) + 1 + isdir);

2
src/nvim/path.h
View File

@@ -22,7 +22,7 @@
* is used when executing commands and EW_SILENT for interactive expanding. */ * is used when executing commands and EW_SILENT for interactive expanding. */
#define EW_ALLLINKS 0x1000 // also links not pointing to existing file #define EW_ALLLINKS 0x1000 // also links not pointing to existing file
#define EW_SHELLCMD 0x2000 // called from expand_shellcmd(), don't check #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_DODOT 0x4000 // also files starting with a dot
#define EW_EMPTYOK 0x8000 // no matches is not an error #define EW_EMPTYOK 0x8000 // no matches is not an error