1 files changed, 27 insertions, 0 deletions

diff --git a/libbb/executable.c b/libbb/executable.c
index 29d2a2c85..8e2f99732 100644
--- a/libbb/executable.c
+++ b/libbb/executable.c
@@ -28,6 +28,10 @@ int FAST_FUNC file_is_executable(const char *name)
  * in all cases (*PATHp) contents are temporarily modified
  * but are restored on return (s/:/NUL/ and back).
  */
+#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,23 +43,46 @@ 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) {
                 int ex;
+#if ENABLE_PLATFORM_MINGW32
+                char sep;
 
+                n = (char*)next_path_sep(p);
+                if (n) {
+                        sep = *n;
+                        *n = '\0';
+                }
+#else
                 n = strchr(p, ':');
                 if (n) *n = '\0';
+#endif
                 p = concat_path_file(
                         p[0] ? p : ".", /* handle "::" case */
                         filename
                 );
                 ex = file_is_executable(p);
+#if ENABLE_PLATFORM_MINGW32
+                if (n) *n++ = sep;
+#else
                 if (n) *n++ = ':';
+#endif
                 if (ex) {
                         *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 */