2 files changed, 29 insertions, 16 deletions
diff --git a/win32/mingw.c b/win32/mingw.c
index c7eeea088..0a1af6b72 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -2001,6 +2001,15 @@ int has_exe_suffix_or_dot(const char *name)
        return last_char_is(name, '.') || has_win_suffix(name, 0);
 }
+/* Copy path to an allocated string long enough to allow a file extension
+ * to be added. */
+char *alloc_ext_space(const char *path)
+{
+        char *s = xmalloc(strlen(path) + 5);
+        strcpy(s, path);
+        return s;
+}
 /* Check if path can be made into an executable by adding a suffix.
 * The suffix is added to the end of the argument which must be
 * long enough to allow this.
@@ -2024,6 +2033,22 @@ int add_win32_extension(char *p)
        return FALSE;
 }
+/*
+ * Determine if a path represents a WIN32 executable, adding a suffix
+ * if necessary.  Returns an allocated string if it does, NULL if not.
+ */
+char *
+file_is_win32_exe(const char *name)
+{
+        char *path = alloc_ext_space(name);
+        if ((add_win32_extension(path) || file_is_executable(path)))
+                return path;
+        free(path);
+        return NULL;
+}
 char * FAST_FUNC bs_to_slash(char *str)
 {
        char *p;
@@ -2193,15 +2218,6 @@ const char *need_system_drive(const char *path)
        return NULL;
 }
-/* Copy path to an allocated string long enough to allow a file extension
- * to be added. */
-char *alloc_ext_space(const char *path)
-{
-        char *s = xmalloc(strlen(path) + 5);
-        strcpy(s, path);
-        return s;
-}
 int chdir_system_drive(void)
 {
        const char *sd = get_system_drive();
diff --git a/win32/process.c b/win32/process.c
index 0585f66a6..a0678f50d 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -328,14 +328,12 @@ mingw_spawn_interpreter(int mode, const char *prog, char *const *argv,
        }
 #endif
-        path = alloc_ext_space(interp.path);
+        path = file_is_win32_exe(interp.path);
-        if ((add_win32_extension(path) || file_is_executable(path))) {
+        if (path) {
                new_argv[0] = path;
                ret = mingw_spawn_interpreter(mode, path, new_argv, envp, level);
                goto done;
        }
-        free(path);
-        path = NULL;
        if (unix_path(interp.path)) {
                if ((path = find_first_executable(interp.name)) != NULL) {
@@ -363,13 +361,12 @@ mingw_spawnvp(int mode, const char *cmd, char *const *argv)
                return mingw_spawn_applet(mode, argv, NULL);
 #endif
        if (has_path(cmd)) {
-                path = alloc_ext_space(cmd);
+                path = file_is_win32_exe(cmd);
-                if (add_win32_extension(path) || file_is_executable(path)) {
+                if (path) {
                        ret = mingw_spawn_interpreter(mode, path, argv, NULL, 0);
                        free(path);
                        return ret;
                }
-                free(path);
                if (unix_path(cmd))
                        cmd = bb_basename(cmd);
        }