re-order a little for alphabetical

[oweals/busybox.git] / applets / busybox.c

diff --git a/applets/busybox.c b/applets/busybox.c
index 420c9c0e5d350ffec83ae5431056ca289917006a..833e8d37292ccb8fa603aa43d311182692a256b8 100644 (file)
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -5,8 +5,10 @@
 #include <errno.h>
 #include <stdlib.h>
 #include "busybox.h"
-#ifdef CONFIG_LOCALE_SUPPORT
+#if ENABLE_LOCALE_SUPPORT
 #include <locale.h>
+#else
+#define setlocale(x,y)
 #endif
 
 const char *bb_applet_name;
@@ -54,6 +56,8 @@ static void install_links(const char *busybox, int use_symbolic_links)
        }
 }
 
+#else
+#define install_links(x,y)
 #endif /* CONFIG_FEATURE_INSTALLER */
 
 int main(int argc, char **argv)
@@ -106,8 +110,9 @@ int busybox_main(int argc, char **argv)
        /* Deal with --help.  (Also print help when called with no arguments) */
        
        if (argc==1 || !strcmp(argv[1],"--help") ) {
-               if (argc>2) run_applet_by_name(bb_applet_name=argv[2], argc, argv);
-               else {
+               if (argc>2) {
+                       run_applet_by_name(bb_applet_name=argv[2], 2, argv);
+               } else {
                        const struct BB_applet *a;
                        int col, output_width;