From 67991cf824f8df27e74c92d754fb507681c69ce6 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 14 Feb 2001 21:23:06 +0000 Subject: This patch, put together by Manuel Novoa III, is a merge of work done by Evin Robertson (bug#1105) and work from Manuel to make usage messages occupy less space and simplify how usage messages are displayed. --- applets/busybox.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'applets/busybox.c') diff --git a/applets/busybox.c b/applets/busybox.c index 1409efa54..6c1070fc8 100644 --- a/applets/busybox.c +++ b/applets/busybox.c @@ -87,7 +87,6 @@ static void install_links(const char *busybox, int use_symbolic_links) int main(int argc, char **argv) { - struct BB_applet *applet; const char *s; for (s = applet_name = argv[0]; *s != '\0';) { @@ -103,13 +102,7 @@ int main(int argc, char **argv) } #endif - /* Do a binary search to find the applet entry given the name. */ - if ((applet = find_applet_by_name(applet_name)) != NULL) { - if (applet->usage && argv[1] && strcmp(argv[1], "--help") == 0) - usage(applet->usage); - exit((*(applet->main)) (argc, argv)); - } - + run_applet_by_name(applet_name, argc, argv); error_msg_and_die("applet not found"); } -- cgit v1.2.3