Remove debugging statement.

[oweals/busybox.git] / busybox.c

diff --git a/busybox.c b/busybox.c
index ab3762eb875d6565ade15630f80570cd9e265b29..7a220f7b04dc96c0c6c3ff864c85b3bb07ac3dff 100644 (file)
--- a/busybox.c
+++ b/busybox.c
@@ -1,22 +1,15 @@
 /* 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"
+#ifdef BB_LOCALE_SUPPORT
+#include <locale.h>
+#endif
 
-#undef APPLET
-#undef APPLET_NOUSAGE
-#undef PROTOTYPES
-#include "applets.h"
-
-#define bb_need_full_version
-#define BB_DECLARE_EXTERN
-#include "messages.c"
-
-static int been_there_done_that = 0;
-
-
+int been_there_done_that = 0; /* Also used in applets.c */
 const char *applet_name;
 
 #ifdef BB_FEATURE_INSTALLER
@@ -44,21 +37,7 @@ typedef int (*__link_f)(const char *, const char *);
  */
 static char *busybox_fullpath()
 {
-       pid_t pid;
-       char path[256];
-       char proc[256];
-       int len;
-
-       pid = getpid();
-       sprintf(proc, "/proc/%d/exe", pid);
-       len = readlink(proc, path, 256);
-       if (len != -1) {
-               path[len] = 0;
-       } else {
-               perror_msg("%s", proc);
-               return NULL;
-       }
-       return strdup(path);
+       return xreadlink("/proc/self/exe");
 }
 
 /* create (sym)links for each applet */
@@ -66,21 +45,21 @@ static void install_links(const char *busybox, int use_symbolic_links)
 {
        __link_f Link = link;
 
-       char command[256];
+       char *fpc;
        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);
-               rc = Link(busybox, command);
-
-               if (rc) {
-                       perror_msg("%s", command);
+               fpc = concat_path_file(
+                       install_dir[applets[i].location], applets[i].name);
+               rc = Link(busybox, fpc);
+               if (rc!=0 && errno!=EEXIST) {
+                       perror_msg("%s", fpc);
                }
+               free(fpc);
        }
 }
 
@@ -88,33 +67,29 @@ 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++ == '/')
                        applet_name = s;
        }
 
-#ifdef BB_SH
-       /* Add in a special case hack -- whenever **argv == '-'
-        * (i.e. '-su' or '-sh') always invoke the shell */
+       /* Add in a special case hack for a leading hyphen */
        if (**argv == '-' && *(*argv+1)!= '-') {
-               exit(((*(shell_main)) (argc, argv)));
+               applet_name = (*argv+1);
        }
-#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));
+#ifdef BB_LOCALE_SUPPORT 
+#ifdef BB_INIT
+       if(getpid()!=1) /* Do not set locale for `init' */
+#endif
+       {
+               setlocale(LC_ALL, "");
        }
+#endif
 
-       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 +152,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 +165,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;