1 files changed, 19 insertions, 15 deletions

diff --git a/src/nvim/path.c b/src/nvim/path.c
index 29ff62ef77..aff0ee2d48 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -981,12 +981,12 @@ static void uniquefy_paths(garray_T *gap, char_u *pattern)
  * "/path/file", "/path/dir/", "/path//dir", "/file"
  *	 ^	       ^	     ^	      ^
  */
-static char_u *gettail_dir(char_u *fname)
+char_u *gettail_dir(const char_u *fname)
 {
-  char_u      *dir_end = fname;
-  char_u      *next_dir_end = fname;
+  const char_u      *dir_end = fname;
+  const char_u      *next_dir_end = fname;
   bool look_for_sep = true;
-  char_u      *p;
+  const char_u      *p;
 
   for (p = fname; *p != NUL; ) {
     if (vim_ispathsep(*p)) {
@@ -1001,7 +1001,7 @@ static char_u *gettail_dir(char_u *fname)
     }
     mb_ptr_adv(p);
   }
-  return dir_end;
+  return (char_u *)dir_end;
 }
 
 
@@ -1301,9 +1301,10 @@ void addfile(
   FileInfo file_info;
 
   // if the file/dir/link doesn't exist, may not add it
-  if (!(flags & EW_NOTFOUND) &&
-      ((flags & EW_ALLLINKS) ?
-       !os_fileinfo_link((char *)f, &file_info) : !os_file_exists(f))) {
+  if (!(flags & EW_NOTFOUND)
+      && ((flags & EW_ALLLINKS)
+          ? !os_fileinfo_link((char *)f, &file_info)
+          : !os_file_exists(f))) {
     return;
   }
 
@@ -1317,9 +1318,12 @@ void addfile(
   if ((isdir && !(flags & EW_DIR)) || (!isdir && !(flags & EW_FILE)))
     return;
 
-  /* If the file isn't executable, may not add it.  Do accept directories. */
-  if (!isdir && (flags & EW_EXEC) && !os_can_exe(f, NULL))
+  // 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))) {
     return;
+  }
 
   char_u *p = xmalloc(STRLEN(f) + 1 + isdir);
 
@@ -1383,9 +1387,9 @@ void simplify_filename(char_u *filename)
           --p;                          /* strip preceding path separator */
         STRMOVE(p, tail);
       }
-    } else if (p[0] == '.' && p[1] == '.' &&
-               (vim_ispathsep(p[2]) || p[2] == NUL)) {
-      /* Skip to after ".." or "../" or "..///". */
+    } else if (p[0] == '.' && p[1] == '.'
+               && (vim_ispathsep(p[2]) || p[2] == NUL)) {
+      // Skip to after ".." or "../" or "..///".
       tail = p + 2;
       while (vim_ispathsep(*tail))
         mb_ptr_adv(tail);
@@ -2016,8 +2020,8 @@ int match_suffix(char_u *fname)
         break;
       }
     } else {
-      if (fnamelen >= setsuflen &&
-          fnamencmp(suf_buf, fname + fnamelen - setsuflen, setsuflen) == 0) {
+      if (fnamelen >= setsuflen
+          && fnamencmp(suf_buf, fname + fnamelen - setsuflen, setsuflen) == 0) {
         break;
       }
       setsuflen = 0;