2 files changed, 10 insertions, 4 deletions

diff --git a/libbb/executable.c b/libbb/executable.c
index e20bf89e4..32b37f29d 100644
--- a/libbb/executable.c
+++ b/libbb/executable.c
@@ -15,7 +15,12 @@
 int FAST_FUNC file_is_executable(const char *name)
 {
         struct stat s;
+#if !ENABLE_PLATFORM_MINGW32
         return (!access(name, X_OK) && !stat(name, &s) && S_ISREG(s.st_mode));
+#else
+        /* expand WIN32 implementation of access(2) */
+        return (!stat(name, &s) && S_ISREG(s.st_mode) && (s.st_mode & S_IXUSR));
+#endif
 }
 
 /* search (*PATHp) for an executable file;
@@ -53,12 +58,13 @@ char* FAST_FUNC find_executable(const char *filename, char **PATHp)
 #if ENABLE_PLATFORM_MINGW32
                 {
                         char *w = alloc_system_drive(p);
-                        add_win32_extension(w);
+                        ex = add_win32_extension(w) || file_is_executable(w);
                         free(p);
                         p = w;
                 }
-#endif
+#else
                 ex = file_is_executable(p);
+#endif
                 if (n) *n++ = PATH_SEP;
                 if (ex) {
                         *PATHp = n;
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index e7de32250..f17c9a215 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -958,8 +958,8 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                                 goto cont; /* hmm, remove in progress? */
 
 # if ENABLE_PLATFORM_MINGW32
-                        if (type == FIND_EXE_ONLY && !S_ISDIR(st.st_mode) &&
-                                        !file_is_executable(found))
+                        if (type == FIND_EXE_ONLY && S_ISREG(st.st_mode) &&
+                                        !(st.st_mode & S_IXUSR))
                                 goto cont;
 # endif