1 files changed, 20 insertions, 2 deletions

diff --git a/libbb/executable.c b/libbb/executable.c
index 09bed1eaf..263141912 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;
@@ -40,8 +45,9 @@ char* FAST_FUNC find_executable(const char *name, const char **PATHp)
         if (!p)
                 return NULL;
         while (1) {
-                const char *end = strchrnul(p, ':');
+                const char *end = strchrnul(p, PATH_SEP);
                 int sz = end - p;
+                int ex;
 
                 if (sz != 0) {
                         p = xasprintf("%.*s/%s", sz, p, name);
@@ -55,7 +61,19 @@ char* FAST_FUNC find_executable(const char *name, const char **PATHp)
 // With -a, both skip over all colons: xxx::::yyy is the same as xxx::yyy,
 // current dir is not tried the second time.
                 }
-                if (file_is_executable(p)) {
+#if ENABLE_PLATFORM_MINGW32
+                {
+                        char *w = file_is_win32_exe(p);
+                        ex = w != NULL;
+                        if (ex) {
+                                free(p);
+                                p = w;
+                        }
+                }
+#else
+                ex = file_is_executable(p);
+#endif
+                if (ex) {
                         *PATHp = (*end ? end+1 : NULL);
                         return p;
                 }