4 files changed, 78 insertions, 40 deletions

diff --git a/applets/Kbuild b/applets/Kbuild.src
index a6b0cf6fb..e3bac9681 100644
--- a/applets/Kbuild
+++ b/applets/Kbuild.src
@@ -27,9 +27,9 @@ HOSTCFLAGS_usage_pod.o = -I$(srctree_slash)include -Iinclude
 
 applets/applets.o: include/usage_compressed.h include/applet_tables.h
 
-applets/applet_tables: .config $(srctree_slash)include/applets.h
-applets/usage:         .config $(srctree_slash)include/applets.h
-applets/usage_pod:     .config include/applet_tables.h $(srctree_slash)include/applets.h
+applets/applet_tables: .config include/applets.h
+applets/usage:         .config include/applets.h
+applets/usage_pod:     .config include/applet_tables.h include/applets.h
 
 quiet_cmd_gen_usage_compressed = GEN     include/usage_compressed.h
       cmd_gen_usage_compressed = $(srctree_slash)applets/usage_compressed include/usage_compressed.h applets
diff --git a/applets/usage.c b/applets/usage.c
index d4fd12f9b..46adbf475 100644
--- a/applets/usage.c
+++ b/applets/usage.c
@@ -5,9 +5,9 @@
  * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 #include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
 
-/* Just #include "autoconf.h" doesn't work for builds in separate
- * object directory */
 #include "autoconf.h"
 
 /* Since we can't use platform.h, have to do this again by hand: */
@@ -21,14 +21,35 @@
 # define USE_FOR_MMU(...) __VA_ARGS__
 #endif
 
-static const char usage_messages[] = ""
-#define MAKE_USAGE
 #include "usage.h"
+#define MAKE_USAGE(aname, usage) { aname, usage },
+static struct usage_data {
+        const char *aname;
+        const char *usage;
+} usage_array[] = {
 #include "applets.h"
-;
+};
+
+static int compare_func(const void *a, const void *b)
+{
+        const struct usage_data *ua = a;
+        const struct usage_data *ub = b;
+        return strcmp(ua->aname, ub->aname);
+}
 
 int main(void)
 {
-        write(STDOUT_FILENO, usage_messages, sizeof(usage_messages));
+        int i;
+        int num_messages = sizeof(usage_array) / sizeof(usage_array[0]);
+
+        if (num_messages == 0)
+                return 0;
+
+        qsort(usage_array,
+                num_messages, sizeof(usage_array[0]),
+                compare_func);
+        for (i = 0; i < num_messages; i++)
+                write(STDOUT_FILENO, usage_array[i].usage, strlen(usage_array[i].usage) + 1);
+
         return 0;
 }
diff --git a/applets/usage_compressed b/applets/usage_compressed
index 8d343529d..bfd5aa873 100755
--- a/applets/usage_compressed
+++ b/applets/usage_compressed
@@ -9,12 +9,19 @@ test -x "$loc/usage" || exit 1
 test "$SED" || SED=sed
 test "$DD" || DD=dd
 
-sz=`"$loc/usage" | wc -c` || exit 1
-
 exec >"$target"
 
-echo 'static const char packed_usage[] ALIGN1 = {'
+echo '#define UNPACKED_USAGE "" \'
+"$loc/usage" | od -v -t x1 \
+| $SED -e 's/^[^ ]*//' \
+        -e 's/ //g' \
+        -e '/^$/d' \
+        -e 's/\(..\)/\\x\1/g' \
+        -e 's/^/"/' \
+        -e 's/$/" \\/'
+echo ''
 
+echo '#define PACKED_USAGE \'
 ## Breaks on big-endian systems!
 ## # Extra effort to avoid using "od -t x1": -t is not available
 ## # in non-CONFIG_DESKTOPed busybox od
@@ -24,12 +31,11 @@ echo 'static const char packed_usage[] ALIGN1 = {'
 ##      -e 's/ //g' \
 ##      -e '/^$/d' \
 ##      -e 's/\(..\)\(..\)/0x\2,0x\1,/g'
-
+##      -e 's/$/ \\/'
 "$loc/usage" | bzip2 -1 | $DD bs=2 skip=1 2>/dev/null | od -v -t x1 \
 | $SED -e 's/^[^ ]*//' \
         -e 's/ //g' \
         -e '/^$/d' \
-        -e 's/\(..\)/0x\1,/g'
-
-echo '};'
-echo '#define SIZEOF_usage_messages' `expr 0 + $sz`
+        -e 's/\(..\)/0x\1,/g' \
+        -e 's/$/ \\/'
+echo ''
diff --git a/applets/usage_pod.c b/applets/usage_pod.c
index ee3729d7b..85a2a8ec4 100644
--- a/applets/usage_pod.c
+++ b/applets/usage_pod.c
@@ -6,11 +6,10 @@
  */
 #include <unistd.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
-/* Just #include "autoconf.h" doesn't work for builds in separate
- * object directory */
 #include "autoconf.h"
 
 #define SKIP_applet_main
@@ -29,22 +28,39 @@
 # define USE_FOR_MMU(...) __VA_ARGS__
 #endif
 
-static const char usage_messages[] = ""
-#define MAKE_USAGE
 #include "usage.h"
+#define MAKE_USAGE(aname, usage) { aname, usage },
+static struct usage_data {
+        const char *aname;
+        const char *usage;
+} usage_array[] = {
 #include "applets.h"
-;
+};
+
+static int compare_func(const void *a, const void *b)
+{
+        const struct usage_data *ua = a;
+        const struct usage_data *ub = b;
+        return strcmp(ua->aname, ub->aname);
+}
 
 int main(void)
 {
-        const char *names;
-        const char *usage;
         int col, len2;
 
+        int i;
+        int num_messages = sizeof(usage_array) / sizeof(usage_array[0]);
+
+        if (num_messages == 0)
+                return 0;
+
+        qsort(usage_array,
+                num_messages, sizeof(usage_array[0]),
+                compare_func);
+
         col = 0;
-        names = applet_names;
-        while (*names) {
-                len2 = strlen(names) + 2;
+        for (i = 0; i < num_messages; i++) {
+                len2 = strlen(usage_array[i].aname) + 2;
                 if (col >= 76 - len2) {
                         printf(",\n");
                         col = 0;
@@ -55,29 +71,24 @@ int main(void)
                 } else {
                         printf(", ");
                 }
-                printf(names);
+                printf(usage_array[i].aname);
                 col += len2;
-                names += len2 - 1;
         }
         printf("\n\n");
 
         printf("=head1 COMMAND DESCRIPTIONS\n\n");
         printf("=over 4\n\n");
 
-        names = applet_names;
-        usage = usage_messages;
-        while (*names) {
-                if (*names >= 'a' && *names <= 'z'
-                 && *usage != NOUSAGE_STR[0]
+        for (i = 0; i < num_messages; i++) {
+                if (usage_array[i].aname[0] >= 'a' && usage_array[i].aname[0] <= 'z'
+                 && usage_array[i].usage[0] != NOUSAGE_STR[0]
                 ) {
-                        printf("=item B<%s>\n\n", names);
-                        if (*usage)
-                                printf("%s %s\n\n", names, usage);
+                        printf("=item B<%s>\n\n", usage_array[i].aname);
+                        if (usage_array[i].usage[0])
+                                printf("%s %s\n\n", usage_array[i].aname, usage_array[i].usage);
                         else
-                                printf("%s\n\n", names);
+                                printf("%s\n\n", usage_array[i].aname);
                 }
-                names += strlen(names) + 1;
-                usage += strlen(usage) + 1;
         }
         return 0;
 }