1 files changed, 4 insertions, 42 deletions
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index 828ccd556d..2ed0c2c856 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -1,12 +1,4 @@
 /*
- * VIM - Vi IMproved	by Bram Moolenaar
- *
- * Do ":help uganda"  in Vim to read copying and usage conditions.
- * Do ":help credits" in Vim to see a list of people who contributed.
- * See README.txt for an overview of the Vim source code.
- */
-
-/*
  * os_unix.c -- code for all flavors of Unix (BSD, SYSV, SVR4, POSIX, ...)
  *
  * A lot of this file was originally written by Juergen Weigert and later
@@ -42,7 +34,6 @@
 #include "nvim/screen.h"
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
-#include "nvim/tempfile.h"
 #include "nvim/ui.h"
 #include "nvim/types.h"
 #include "nvim/os/os.h"
@@ -52,10 +43,6 @@
 #include "nvim/os/signal.h"
 #include "nvim/msgpack_rpc/helpers.h"
 
-#ifdef HAVE_STROPTS_H
-# include <stropts.h>
-#endif
-
 #ifdef HAVE_SELINUX
 # include <selinux/selinux.h>
 static int selinux_enabled = -1;
@@ -149,26 +136,6 @@ void mch_free_acl(vim_acl_T aclent)
 }
 #endif
 
-/*
- * Check what "name" is:
- * NODE_NORMAL: file or directory (or doesn't exist)
- * NODE_WRITABLE: writable device, socket, fifo, etc.
- * NODE_OTHER: non-writable things
- */
-int mch_nodetype(char_u *name)
-{
-  struct stat st;
-
-  if (stat((char *)name, &st))
-    return NODE_NORMAL;
-  if (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode))
-    return NODE_NORMAL;
-  if (S_ISBLK(st.st_mode))      /* block device isn't writable */
-    return NODE_OTHER;
-  /* Everything else is writable? */
-  return NODE_WRITABLE;
-}
-
 void mch_exit(int r)
 {
   exiting = true;
@@ -187,13 +154,6 @@ void mch_exit(int r)
   exit(r);
 }
 
-#ifndef SEEK_SET
-# define SEEK_SET 0
-#endif
-#ifndef SEEK_END
-# define SEEK_END 2
-#endif
-
 #define SHELL_SPECIAL (char_u *)"\t \"&'$;<>()\\|"
 
 /// Does wildcard pattern matching using the shell.
@@ -616,9 +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. */
-    if (!dir && (flags & EW_EXEC) && !os_can_exe((*file)[i], NULL))
+    // 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))) {
       continue;
+    }
 
     p = xmalloc(STRLEN((*file)[i]) + 1 + dir);
     STRCPY(p, (*file)[i]);