win32: code shrink Unix-style path handling

Replace auto_add_system_drive() with alloc_system_drive() which
leaves space for a possible filename extension.  This makes it
possible to drop alloc_win32_extension() and auto_win32_extension().

Saves 144 bytes.

2 files changed, 6 insertions, 9 deletions

diff --git a/libbb/executable.c b/libbb/executable.c
index 0a0769ef3..f549a7aae 100644
--- a/libbb/executable.c
+++ b/libbb/executable.c
@@ -49,20 +49,16 @@ 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
                 );
                 if (n) *n++ = PATH_SEP;
 #if ENABLE_PLATFORM_MINGW32
-                if ((w=alloc_win32_extension(p))) {
-                        free(p);
-                        p = w;
-                        /* following test will succeed */
-                }
+                w = alloc_system_drive(p);
+                add_win32_extension(w);
+                free(p);
+                p = w;
 #endif
                 ex = file_is_executable(p);
                 if (ex) {
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index f6577e372..b35da1874 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -913,8 +913,9 @@ 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]);
+                char *lpath = auto_string(alloc_system_drive(paths[i]));
                 dir = opendir(lpath);
 #else
                 dir = opendir(paths[i]);