win32: allow hardcoded list of applets to override

The environment variable BB_OVERRIDE_APPLETS provides control over
which applets are preferred in standalone shell mode.  Allow a
similar list to be hardcoded in the binary with the OVERRIDE_APPLETS
configuration string.

The environment variable is checked first.  If it doesn't override
the applet the hardcoded string is then checked too.

The default for OVERRIDE_APPLETS is an empty string.  In this case
the size and behaviour of the binary is unchanged.

1 files changed, 10 insertions, 3 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 6b610743a..3c9cebf1e 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -282,12 +282,11 @@ static int external_exists(const char *name)
         return ret != NULL;
 }
 
-int FAST_FUNC is_applet_preferred(const char *name)
+static int is_applet_preferred_by_var(const char *name, const char *var)
 {
-        const char *var, *s, *sep;
+        const char *s, *sep;
         size_t len;
 
-        var = getenv(BB_OVERRIDE_APPLETS);
         if (var && *var) {
                 /* '-' disables all applets */
                 if (var[0] == '-' && var[1] == '\0')
@@ -319,6 +318,14 @@ int FAST_FUNC is_applet_preferred(const char *name)
         }
         return TRUE;
 }
+
+int FAST_FUNC is_applet_preferred(const char *name)
+{
+        int ret = is_applet_preferred_by_var(name, getenv(BB_OVERRIDE_APPLETS));
+        if (sizeof(CONFIG_OVERRIDE_APPLETS) > 1 && ret)
+                ret = is_applet_preferred_by_var(name, CONFIG_OVERRIDE_APPLETS);
+        return ret;
+}
 #endif