win32: code shrink applet look-up

- Remove find_preferred_applet_by_name().  Instead add a
  reference to is_applet_preferred() in find_applet_by_name().

- Remove the global variable ash_path.  Use a static instead,
  accessed by calling get_ash_path().

- Mark ash_applet_by_name() as NOINLINE.

Saves 64-96 bytes.

(GitHub issue #329)

1 files changed, 2 insertions, 20 deletions

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