2 files changed, 12 insertions, 1 deletions

diff --git a/libbb/executable.c b/libbb/executable.c
index 87a40eeda..0a0769ef3 100644
--- a/libbb/executable.c
+++ b/libbb/executable.c
@@ -49,6 +49,9 @@ char* FAST_FUNC find_executable(const char *filename, char **PATHp)
 
                 n = strchr(p, PATH_SEP);
                 if (n) *n = '\0';
+#if ENABLE_PLATFORM_MINGW32
+                p = auto_add_system_drive(p);
+#endif
                 p = concat_path_file(
                         p[0] ? p : ".", /* handle "::" case */
                         filename
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index a36a1647d..f6577e372 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -913,8 +913,12 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                 struct dirent *next;
                 struct stat st;
                 char *found;
-
+#if ENABLE_PLATFORM_MINGW32
+                char *lpath = auto_add_system_drive(paths[i]);
+                dir = opendir(lpath);
+#else
                 dir = opendir(paths[i]);
+#endif
                 if (!dir)
                         continue; /* don't print an error */
 
@@ -929,7 +933,11 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                         if (!is_prefixed_with(name_found, pfind))
                                 continue; /* no */
 
+#if ENABLE_PLATFORM_MINGW32
+                        found = concat_path_file(lpath, name_found);
+#else
                         found = concat_path_file(paths[i], name_found);
+#endif
                         /* NB: stat() first so that we see is it a directory;
                          * but if that fails, use lstat() so that
                          * we still match dangling links */