Another update from Larry:

[oweals/busybox.git] / busybox.c

diff --git a/busybox.c b/busybox.c
index 6c1070fc866b936d47342de81cae6417e8806bbc..badd53d79de9a7c28dc34fbf1c46903d1f96e8b1 100644 (file)
--- a/busybox.c
+++ b/busybox.c
@@ -1,21 +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
@@ -43,21 +37,10 @@ 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);
+
+       sprintf(proc, "/proc/%d/exe", getpid());
+       return xreadlink(proc);
 }
 
 /* create (sym)links for each applet */
@@ -65,7 +48,7 @@ static void install_links(const char *busybox, int use_symbolic_links)
 {
        __link_f Link = link;
 
-       char command[256];
+       char *fpc;
        int i;
        int rc;
 
@@ -73,13 +56,13 @@ static void install_links(const char *busybox, int 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);
        }
 }
 
@@ -98,10 +81,15 @@ int main(int argc, char **argv)
        /* Add in a special case hack -- whenever **argv == '-'
         * (i.e. '-su' or '-sh') always invoke the shell */
        if (**argv == '-' && *(*argv+1)!= '-') {
-               exit(((*(shell_main)) (argc, argv)));
+               applet_name = "sh";
        }
 #endif
 
+#ifdef BB_LOCALE_SUPPORT
+       if(getpid()!=1) /* Do not set locale for `init' */
+               setlocale(LC_ALL, "");
+#endif
+
        run_applet_by_name(applet_name, argc, argv);
        error_msg_and_die("applet not found");
 }
@@ -166,7 +154,7 @@ int busybox_main(int argc, char **argv)
                        }
                }
                fprintf(stderr, "\n\n");
-               exit(-1);
+               exit(0);
        }
 
        /* Flag that we've been here already */