3 files changed, 19 insertions, 31 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 1200e636a..5c4a01e8d 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1326,16 +1326,13 @@ void run_noexec_applet_and_exit(int a, const char *name, char **argv) NORETURN F
 #ifndef BUILD_INDIVIDUAL
 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;
-int find_preferred_applet_by_name(const char *name) FAST_FUNC;
-int is_applet_preferred(const char *name) FAST_FUNC;
 # if ENABLE_PLATFORM_MINGW32 && \
                 (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_STANDALONE)
-#  if ENABLE_ASH
-extern const char *ash_path;
-#  endif
-#  define find_applet_by_name(n) find_preferred_applet_by_name(n)
+int is_applet_preferred(const char *name) FAST_FUNC;
+const char *get_ash_path(void);
 # else
 #  define is_applet_preferred(n) (1)
+#  define get_ash_path() (NULL)
 # 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 10268b982..a378846b9 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -76,13 +76,6 @@ static inline int *get_perrno(void) { return &errno; }
 static const char packed_scripts[] ALIGN1 = { PACKED_SCRIPTS };
 #endif
 
-#if defined(find_applet_by_name)
-# undef find_applet_by_name
-#endif
-#if defined(is_applet_preferred)
-# undef is_applet_preferred
-#endif
-
 /* "Do not compress usage text if uncompressed text is small
  *  and we don't include bunzip2 code for other reasons"
  *
@@ -245,7 +238,7 @@ int FAST_FUNC find_applet_by_name(const char *name)
                 for (j = 0; *p == name[j]; ++j) {
                         if (*p++ == '\0') {
                                 //bb_error_msg("found:'%s' i:%u", name, i);
-                                return i; /* yes */
+                                return is_applet_preferred(name) ? i : -1; /* yes */
                         }
                 }
                 /* No. Have we gone too far, alphabetically? */
@@ -263,14 +256,9 @@ int FAST_FUNC find_applet_by_name(const char *name)
 
 #if ENABLE_PLATFORM_MINGW32 && NUM_APPLETS > 1 && \
                 (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_STANDALONE)
-# if ENABLE_ASH
-const char *ash_path = NULL;
-# else
-#  define ash_path NULL
-# endif
-
 static int external_exists(const char *name)
 {
+        const char *ash_path = get_ash_path();
         char *path = ash_path ? auto_string(xstrdup(ash_path)) : getenv("PATH");
         char *ret = find_executable(name, &path);
         free(ret);
@@ -314,12 +302,6 @@ int FAST_FUNC is_applet_preferred(const char *name)
         }
         return TRUE;
 }
-
-int FAST_FUNC find_preferred_applet_by_name(const char *name)
-{
-        int applet_no = find_applet_by_name(name);
-        return applet_no >= 0 && is_applet_preferred(name) ? applet_no : -1;
-}
 #endif
 
 
diff --git a/shell/ash.c b/shell/ash.c
index b29927a83..721204c61 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -428,13 +428,21 @@ static void forkshell_print(FILE *fp0, struct forkshell *fs, const char **notes)
 
 #if ENABLE_PLATFORM_MINGW32 && NUM_APPLETS > 1 && \
                 (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_STANDALONE)
-static int
-ash_preferred_applet_by_name(const char *name, const char *path)
+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_preferred_applet_by_name(name);
+        ret = find_applet_by_name(name);
         ash_path = NULL;
 
         return ret;
@@ -451,11 +459,12 @@ ash_applet_preferred(const char *name, const char *path)
 
         return ret;
 }
-# undef find_applet_by_name
-# define find_applet_by_name(n, p) ash_preferred_applet_by_name(n, p)
+# 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. */