1 files changed, 15 insertions, 1 deletions

diff --git a/libbb/executable.c b/libbb/executable.c
index 3a1d4ff44..5f0ff8c6e 100644
--- a/libbb/executable.c
+++ b/libbb/executable.c
@@ -28,6 +28,10 @@ int FAST_FUNC file_is_executable(const char *name)
  * return NULL otherwise; (PATHp is undefined)
  * in all cases (*PATHp) contents will be trashed (s/:/NUL/).
  */
+#if !ENABLE_PLATFORM_MINGW32
+#define next_path_sep(s) strchr(s, ':')
+#endif
+
 char* FAST_FUNC find_executable(const char *filename, char **PATHp)
 {
         /* About empty components in $PATH:
@@ -39,10 +43,13 @@ char* FAST_FUNC find_executable(const char *filename, char **PATHp)
          * following the rest of the list.
          */
         char *p, *n;
+#if ENABLE_PLATFORM_MINGW32
+        char *w;
+#endif
 
         p = *PATHp;
         while (p) {
-                n = strchr(p, ':');
+                n = (char*)next_path_sep(p);
                 if (n)
                         *n++ = '\0';
                 p = concat_path_file(
@@ -53,6 +60,13 @@ char* FAST_FUNC find_executable(const char *filename, char **PATHp)
                         *PATHp = n;
                         return p;
                 }
+#if ENABLE_PLATFORM_MINGW32
+                else if ((w=file_is_win32_executable(p))) {
+                        *PATHp = n;
+                        free(p);
+                        return w;
+                }
+#endif
                 free(p);
                 p = n;
         } /* on loop exit p == NULL */