From: Ron Yorston <rmy@pobox.com>
Date: Tue, 7 Jun 2016 09:26:24 +0000 (+0100)
Subject: Allow "busybox <applet>" to work when busybox is disabled
X-Git-Tag: 1_25_0~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ba12081a9e9b2d90d1924546bc9097abf52cf2b5;p=oweals%2Fbusybox.git

Allow "busybox <applet>" to work when busybox is disabled

A recent commit made it possible to disable BusyBox's --install
and --list options.  However it also stopped "busybox <applet>
<params>" from working.

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 281123c37..b6fe1dad2 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -956,6 +956,10 @@ int main(int argc UNUSED_PARAM, char **argv)
 #else
 	lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv));
 
+#if !ENABLE_BUSYBOX
+	if (argv[1] && is_prefixed_with(bb_basename(argv[0]), "busybox"))
+		argv++;
+#endif
 	applet_name = argv[0];
 	if (applet_name[0] == '-')
 		applet_name++;