readlink: uClibc supports automatic allocation too now

[oweals/busybox.git] / libbb / appletlib.c

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 8157b4f4201808f186aac7d4b8858943ef557953..c22686e55df8b6bdc40a942b45f6a8734b89aec2 100644 (file)
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -62,7 +62,7 @@ static const char usage_messages[] ALIGN1 = UNPACKED_USAGE;
 #if ENABLE_FEATURE_COMPRESS_USAGE
 
 static const char packed_usage[] ALIGN1 = { PACKED_USAGE };
-# include "archive.h"
+# include "bb_archive.h"
 static const char *unpack_usage_messages(void)
 {
        char *outbuf = NULL;
@@ -140,10 +140,9 @@ void FAST_FUNC bb_show_usage(void)
 }
 
 #if NUM_APPLETS > 8
-/* NB: any char pointer will work as well, not necessarily applet_names */
-static int applet_name_compare(const void *name, const void *v)
+static int applet_name_compare(const void *name, const void *idx)
 {
-       int i = (const char *)v - applet_names;
+       int i = (int)(ptrdiff_t)idx - 1;
        return strcmp(name, APPLET_NAME(i));
 }
 #endif
@@ -152,10 +151,12 @@ int FAST_FUNC find_applet_by_name(const char *name)
 #if NUM_APPLETS > 8
        /* Do a binary search to find the applet entry given the name. */
        const char *p;
-       p = bsearch(name, applet_names, ARRAY_SIZE(applet_main), 1, applet_name_compare);
-       if (!p)
-               return -1;
-       return p - applet_names;
+       p = bsearch(name, (void*)(ptrdiff_t)1, ARRAY_SIZE(applet_main), 1, applet_name_compare);
+       /*
+        * if (!p) return -1;
+        * ^^^^^^^^^^^^^^^^^^ the code below will do this if p == NULL :)
+        */
+       return (int)(ptrdiff_t)p - 1;
 #else
        /* A version which does not pull in bsearch */
        int i = 0;
@@ -627,12 +628,15 @@ static int busybox_main(char **argv)
                full_write2_str(bb_banner); /* reuse const string */
                full_write2_str(" multi-call binary.\n"); /* reuse */
                full_write2_str(
-                       "Copyright (C) 1998-2011 Erik Andersen, Rob Landley, Denys Vlasenko\n"
-                       "and others. Licensed under GPLv2.\n"
-                       "See source distribution for full notice.\n"
+                       "BusyBox is copyrighted by many authors between 1998-2012.\n"
+                       "Licensed under GPLv2. See source distribution for detailed\n"
+                       "copyright notices.\n"
                        "\n"
-                       "Usage: busybox [function] [arguments]...\n"
-                       "   or: busybox --list[-full]\n"
+                       "Usage: busybox [function [arguments]...]\n"
+                       "   or: busybox --list"IF_FEATURE_INSTALLER("[-full]")"\n"
+                       IF_FEATURE_INSTALLER(
+                       "   or: busybox --install [-s] [DIR]\n"
+                       )
                        "   or: function [arguments]...\n"
                        "\n"
                        "\tBusyBox is a multi-call binary that combines many common Unix\n"
@@ -672,7 +676,7 @@ static int busybox_main(char **argv)
                dup2(1, 2);
                while (*a) {
 # if ENABLE_FEATURE_INSTALLER
-                       if (argv[1][6]) /* --list-path? */
+                       if (argv[1][6]) /* --list-full? */
                                full_write2_str(install_dir[APPLET_INSTALL_LOC(i)] + 1);
 # endif
                        full_write2_str(a);
@@ -702,7 +706,7 @@ static int busybox_main(char **argv)
                 * -s: make symlinks
                 * DIR: directory to install links to
                 */
-               use_symbolic_links = (argv[2] && strcmp(argv[2], "-s") == 0 && argv++);
+               use_symbolic_links = (argv[2] && strcmp(argv[2], "-s") == 0 && ++argv);
                install_links(busybox, use_symbolic_links, argv[2]);
                return 0;
        }
@@ -744,8 +748,11 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv)
                /* Special case. POSIX says "test --help"
                 * should be no different from e.g. "test --foo".  */
 //TODO: just compare applet_no with APPLET_NO_test
-               if (!ENABLE_TEST || strcmp(applet_name, "test") != 0)
+               if (!ENABLE_TEST || strcmp(applet_name, "test") != 0) {
+                       /* If you want "foo --help" to return 0: */
+                       xfunc_error_retval = 0;
                        bb_show_usage();
+               }
        }
        if (ENABLE_FEATURE_SUID)
                check_suid(applet_no);