Applied patch from Larry Doolittle to remove some strlen calls, and add one

[oweals/busybox.git] / busybox.c

diff --git a/busybox.c b/busybox.c
index 2872f1e38c0c6c0feaa9cc6ce12f0423d17830d3..9db26df271858d6f1fa070b26a2d8bb1bc39feae 100644 (file)
--- a/busybox.c
+++ b/busybox.c
@@ -10,7 +10,11 @@
 #define BB_DECLARE_EXTERN
 #include "messages.c"
 
-static int been_there_done_that = 0;
+#ifdef BB_LOCALE_SUPPORT
+#include <locale.h>
+#endif
+
+int been_there_done_that = 0; /* Also used in applets.c */
 const char *applet_name;
 
 #ifdef BB_FEATURE_INSTALLER
@@ -60,7 +64,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;
 
@@ -68,13 +72,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);
        }
 }
 
@@ -93,10 +97,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");
 }