aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2016-06-07 10:26:24 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2016-06-18 19:15:20 +0200
commitba12081a9e9b2d90d1924546bc9097abf52cf2b5 (patch)
tree53196419f5e93639a8ea085b1c80214dc2296f37
parente4caf1dd9ce8569371a0eeb77ccf02a572dc0f11 (diff)
downloadbusybox-w32-ba12081a9e9b2d90d1924546bc9097abf52cf2b5.tar.gz
busybox-w32-ba12081a9e9b2d90d1924546bc9097abf52cf2b5.tar.bz2
busybox-w32-ba12081a9e9b2d90d1924546bc9097abf52cf2b5.zip
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>
-rw-r--r--libbb/appletlib.c4
1 files changed, 4 insertions, 0 deletions
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)
956#else 956#else
957 lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv)); 957 lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv));
958 958
959#if !ENABLE_BUSYBOX
960 if (argv[1] && is_prefixed_with(bb_basename(argv[0]), "busybox"))
961 argv++;
962#endif
959 applet_name = argv[0]; 963 applet_name = argv[0];
960 if (applet_name[0] == '-') 964 if (applet_name[0] == '-')
961 applet_name++; 965 applet_name++;