diff options
author | Rob Landley <rob@landley.net> | 2005-09-01 00:02:56 +0000 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2005-09-01 00:02:56 +0000 |
commit | 91397707645a63cf2e8290d21f5fc5e41dfa4a25 (patch) | |
tree | 12fe5f9cfc3e8e7042ebb8009737c72d9fbfadae /applets | |
parent | 29ee76cb2bf3a58eadad402a60354ddb28102d7f (diff) | |
download | busybox-w32-91397707645a63cf2e8290d21f5fc5e41dfa4a25.tar.gz busybox-w32-91397707645a63cf2e8290d21f5fc5e41dfa4a25.tar.bz2 busybox-w32-91397707645a63cf2e8290d21f5fc5e41dfa4a25.zip |
Busybox should only multiplex based on argv[1] when it's called as "busybox".
Otherwise if you build busybox without a given applet you get the wrong error
message when you call it via a symlink to that applet.
(You also get the wrong behavior; it tries to use argv[1] as the command
name just like busybox does for _any_ unknown, and although I doubt
"echo rm -rf *" is common usage there's no upside and enough downside to
make me nervous.)
This fixes it.
Diffstat (limited to 'applets')
-rw-r--r-- | applets/applets.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/applets/applets.c b/applets/applets.c index 9db16b41d..ce9ecbbc5 100644 --- a/applets/applets.c +++ b/applets/applets.c | |||
@@ -163,10 +163,6 @@ run_applet_by_name (const char *name, int argc, char **argv) | |||
163 | 163 | ||
164 | exit ((*(applet_using->main)) (argc, argv)); | 164 | exit ((*(applet_using->main)) (argc, argv)); |
165 | } | 165 | } |
166 | /* Just in case they have renamed busybox - Check argv[1] */ | ||
167 | if (recurse_level == 1) { | ||
168 | run_applet_by_name ("busybox", argc, argv); | ||
169 | } | ||
170 | recurse_level--; | 166 | recurse_level--; |
171 | } | 167 | } |
172 | 168 | ||