win32: code shrink applet overrides

Pass the PATH to be used to look up executables down from the shell
to the applet override code.  This replaces the use of a static
variable and a function to fetch its value.

Saves 16-32 bytes.

4 files changed, 32 insertions, 62 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 0682e34ea..a3611abc3 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1329,11 +1329,11 @@ int find_applet_by_name(const char *name) FAST_FUNC;
 void run_applet_no_and_exit(int a, const char *name, char **argv) NORETURN FAST_FUNC;
 # if ENABLE_PLATFORM_MINGW32 && \
                 (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_STANDALONE)
-int is_applet_preferred(const char *name) FAST_FUNC;
-const char *get_ash_path(void);
+int is_applet_preferred(const char *name, const char *path) FAST_FUNC;
+int find_applet_by_name_with_path(const char *name, const char *path) FAST_FUNC;
 # else
-#  define is_applet_preferred(n) (1)
-#  define get_ash_path() (NULL)
+#  define is_applet_preferred(n, p) (1)
+#  define find_applet_by_name_with_path(n, p) find_applet_by_name(n)
 # endif
 #endif
 void show_usage_if_dash_dash_help(int applet_no, char **argv) FAST_FUNC;
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 3c9cebf1e..5cd2bbcc2 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -264,25 +264,32 @@ int FAST_FUNC find_applet_by_name(const char *name)
 }
 
 #if ENABLE_PLATFORM_MINGW32
-int FAST_FUNC find_applet_by_name(const char *name)
+# undef find_applet_by_name_with_path
+int FAST_FUNC find_applet_by_name_with_path(const char *name, const char *path)
 {
         int applet_no = really_find_applet_by_name(name);
-        return applet_no >= 0 && is_applet_preferred(name) ? applet_no : -1;
+        return applet_no >= 0 && is_applet_preferred(name, path) ? applet_no : -1;
+}
+
+int FAST_FUNC find_applet_by_name(const char *name)
+{
+        return find_applet_by_name_with_path(name, NULL);
 }
 #endif
 
 #if ENABLE_PLATFORM_MINGW32 && NUM_APPLETS > 1 && \
                 (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_STANDALONE)
-static int external_exists(const char *name)
+static int external_exists(const char *name, const char *path)
 {
-        const char *ash_path = get_ash_path();
-        char *path = ash_path ? auto_string(xstrdup(ash_path)) : getenv("PATH");
-        char *ret = find_executable(name, &path);
+        char *path1 = xstrdup(path ?: getenv("PATH"));
+        char *ret = find_executable(name, &path1);
         free(ret);
+        free(path1);
         return ret != NULL;
 }
 
-static int is_applet_preferred_by_var(const char *name, const char *var)
+static int is_applet_preferred_by_var(const char *name, const char *path,
+                                                                                const char *var)
 {
         const char *s, *sep;
         size_t len;
@@ -294,7 +301,7 @@ static int is_applet_preferred_by_var(const char *name, const char *var)
 
                 /* '+' each applet is overridden if an external command exists */
                 if (var[0] == '+' && var[1] == '\0')
-                        return !external_exists(name);
+                        return !external_exists(name, path);
 
                 /* Handle applets from a list separated by spaces, commas or
                  * semicolons.  Applets before the first semicolon are disabled.
@@ -313,17 +320,20 @@ static int is_applet_preferred_by_var(const char *name, const char *var)
                         /* neither "..name" nor "..name,xxx"? */
                         if (s[len] != '\0' && !strchr(" ,;", s[len]))
                                 continue;
-                        return (sep == NULL || s < sep) ? FALSE : !external_exists(name);
+                        return (sep == NULL || s < sep) ?
+                                                FALSE : !external_exists(name, path);
                 }
         }
         return TRUE;
 }
 
-int FAST_FUNC is_applet_preferred(const char *name)
+int FAST_FUNC is_applet_preferred(const char *name, const char *path)
 {
-        int ret = is_applet_preferred_by_var(name, getenv(BB_OVERRIDE_APPLETS));
+        int ret;
+
+        ret = is_applet_preferred_by_var(name, path, getenv(BB_OVERRIDE_APPLETS));
         if (sizeof(CONFIG_OVERRIDE_APPLETS) > 1 && ret)
-                ret = is_applet_preferred_by_var(name, CONFIG_OVERRIDE_APPLETS);
+                ret = is_applet_preferred_by_var(name, path, CONFIG_OVERRIDE_APPLETS);
         return ret;
 }
 #endif
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 1a118eb92..58ac68c22 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -975,7 +975,8 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
 # if ENABLE_FEATURE_SH_STANDALONE && NUM_APPLETS != 1
                 const char *p = applet_names;
                 while (*p) {
-                        if (strncmp(basecmd, p, baselen) == 0 && is_applet_preferred(p))
+                        if (strncmp(basecmd, p, baselen) == 0 &&
+                                        is_applet_preferred(p, NULL))
                                 add_match(xstrdup(p), TRUE);
                         while (*p++ != '\0')
                                 continue;
diff --git a/shell/ash.c b/shell/ash.c
index 95bf81db3..d81d27d25 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -452,47 +452,6 @@ static void forkshell_print(FILE *fp0, struct forkshell *fs, const char **notes)
 # endif
 #endif
 
-#if ENABLE_PLATFORM_MINGW32 && NUM_APPLETS > 1 && \
-                (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_STANDALONE)
-static const char *ash_path;
-
-const char *
-get_ash_path(void)
-{
-        return ash_path;
-}
-
-static int NOINLINE
-ash_applet_by_name(const char *name, const char *path)
-{
-        int ret;
-
-        ash_path = path;
-        ret = find_applet_by_name(name);
-        ash_path = NULL;
-
-        return ret;
-}
-
-static int
-ash_applet_preferred(const char *name, const char *path)
-{
-        int ret;
-
-        ash_path = path;
-        ret = is_applet_preferred(name);
-        ash_path = NULL;
-
-        return ret;
-}
-# define find_applet_by_name(n, p) ash_applet_by_name(n, p)
-# define is_applet_preferred(n, p) ash_applet_preferred(n, p)
-#else
-# define find_applet_by_name(n, p) find_applet_by_name(n)
-# undef is_applet_preferred
-# define is_applet_preferred(n, p) (1)
-#endif
-
 /* ============ Hash table sizes. Configurable. */
 
 #define VTABSIZE 39
@@ -9238,7 +9197,7 @@ static void shellexec(char *prog, char **argv, const char *path, int idx)
         if (has_path(prog)
 #endif
 #if ENABLE_FEATURE_SH_STANDALONE
-         || (applet_no = find_applet_by_name(prog, path)) >= 0
+         || (applet_no = find_applet_by_name_with_path(prog, path)) >= 0
 #endif
         ) {
 #if ENABLE_PLATFORM_MINGW32
@@ -9259,7 +9218,7 @@ static void shellexec(char *prog, char **argv, const char *path, int idx)
                 if (unix_path(prog)) {
                         const char *name = bb_basename(prog);
 # if ENABLE_FEATURE_SH_STANDALONE
-                        if ((applet_no = find_applet_by_name(name, path)) >= 0) {
+                        if ((applet_no = find_applet_by_name_with_path(name, path)) >= 0) {
                                 tryexec(applet_no, name, argv, envp);
                                 e = errno;
                         }
@@ -15074,7 +15033,7 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path)
                         name = (char *)bb_basename(name);
                         if (
 # if ENABLE_FEATURE_SH_STANDALONE
-                                        find_applet_by_name(name, path) >= 0 ||
+                                        find_applet_by_name_with_path(name, path) >= 0 ||
 # endif
                                         !find_builtin(bb_basename(name))
                         ) {
@@ -15145,7 +15104,7 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path)
 
 #if ENABLE_FEATURE_SH_STANDALONE
         {
-                int applet_no = find_applet_by_name(name, path);
+                int applet_no = find_applet_by_name_with_path(name, path);
                 if (applet_no >= 0) {
                         entry->cmdtype = CMDNORMAL;
                         entry->u.index = -2 - applet_no;