Thought of another janitorial item for the list.

[oweals/busybox.git] / busybox.c

diff --git a/busybox.c b/busybox.c
index ab3762eb875d6565ade15630f80570cd9e265b29..0250e4c108ccee77d65c0b28c4e467e617d5724b 100644 (file)
--- a/busybox.c
+++ b/busybox.c
@@ -1,9 +1,10 @@
 /* vi: set sw=4 ts=4: */
-#include "busybox.h"
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
+#include "busybox.h"
 
 #undef APPLET
 #undef APPLET_NOUSAGE
@@ -15,8 +16,6 @@
 #include "messages.c"
 
 static int been_there_done_that = 0;
-
-
 const char *applet_name;
 
 #ifdef BB_FEATURE_INSTALLER
@@ -70,12 +69,12 @@ static void install_links(const char *busybox, int use_symbolic_links)
        int i;
        int rc;
 
-       if (use_symbolic_links) Link = symlink;
+       if (use_symbolic_links) 
+               Link = symlink;
 
        for (i = 0; applets[i].name != NULL; i++) {
                sprintf ( command, "%s/%s", 
-                               install_dir[applets[i].location], 
-                               applets[i].name);
+                               install_dir[applets[i].location], applets[i].name);
                rc = Link(busybox, command);
 
                if (rc) {
@@ -88,8 +87,7 @@ static void install_links(const char *busybox, int use_symbolic_links)
 
 int main(int argc, char **argv)
 {
-       struct BB_applet search_applet, *applet;
-       const char                              *s;
+       const char *s;
 
        for (s = applet_name = argv[0]; *s != '\0';) {
                if (*s++ == '/')
@@ -104,17 +102,8 @@ int main(int argc, char **argv)
        }
 #endif
 
-       /* Do a binary search to find the applet entry given the name. */
-       search_applet.name = applet_name;
-       applet = bsearch(&search_applet, applets, NUM_APPLETS,
-                       sizeof(struct BB_applet), applet_name_compare);
-       if (applet != NULL) {
-               if (applet->usage && argv[1] && strcmp(argv[1], "--help") == 0)
-                       usage(applet->usage); 
-               exit((*(applet->main)) (argc, argv));
-       }
-
-       error_msg_and_die("applet not found\n");
+       run_applet_by_name(applet_name, argc, argv);
+       error_msg_and_die("applet not found");
 }
 
 
@@ -177,7 +166,7 @@ int busybox_main(int argc, char **argv)
                        }
                }
                fprintf(stderr, "\n\n");
-               exit(-1);
+               exit(0);
        }
 
        /* Flag that we've been here already */
@@ -190,7 +179,7 @@ int busybox_main(int argc, char **argv)
 
        /* Fix up the argv pointers */
        len = argv[1] - argv[0];
-       memmove(argv, argv+1, sizeof(char *) * (argc + 1));
+       memmove(argv, argv + 1, sizeof(char *) * (argc + 1));
        for (i = 0; i < argc; i++)
                argv[i] -= len;