1 files changed, 12 insertions, 2 deletions

diff --git a/libbb/executable.c b/libbb/executable.c
index 29d2a2c85..87a40eeda 100644
--- a/libbb/executable.c
+++ b/libbb/executable.c
@@ -39,19 +39,29 @@ 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;
 
-                n = strchr(p, ':');
+                n = strchr(p, PATH_SEP);
                 if (n) *n = '\0';
                 p = concat_path_file(
                         p[0] ? p : ".", /* handle "::" case */
                         filename
                 );
+                if (n) *n++ = PATH_SEP;
+#if ENABLE_PLATFORM_MINGW32
+                if ((w=alloc_win32_extension(p))) {
+                        free(p);
+                        p = w;
+                        /* following test will succeed */
+                }
+#endif
                 ex = file_is_executable(p);
-                if (n) *n++ = ':';
                 if (ex) {
                         *PATHp = n;
                         return p;