2 files changed, 4 insertions, 3 deletions

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 14eb16873..f4247d237 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -863,7 +863,7 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                 /* path is of form c:path with no '/' */
                 if (get_drive_cwd(command, buffer, PATH_MAX)) {
                         pfind = command + 2;
-                        path1[0] = xstrdup(buffer);
+                        path1[0] = dirbuf = xstrdup(buffer);
                 }
         } else
 #endif
diff --git a/win32/process.c b/win32/process.c
index 8546c6e2f..4257fd689 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -320,8 +320,9 @@ mingw_spawn_1(int mode, const char *cmd, char *const *argv, char *const *envp)
                 return mingw_spawn_applet(mode, argv, envp);
         else
 #endif
-        if (strchr(cmd, '/') || strchr(cmd, '\\')) {
-                return mingw_spawn_interpreter(mode, cmd, argv, envp);
+        if (strchr(cmd, '/') || strchr(cmd, '\\') || has_dos_drive_prefix(cmd)) {
+                const char *path = auto_win32_extension(cmd);
+                return mingw_spawn_interpreter(mode, path ? path : cmd, argv, envp);
         }
         else if ((prog=find_first_executable(cmd)) != NULL) {
                 intptr_t ret = mingw_spawn_interpreter(mode, prog, argv, envp);