busybox: show embedded scripts in applet list
authorDenys Vlasenko <vda.linux@googlemail.com>
Thu, 1 Nov 2018 12:58:16 +0000 (13:58 +0100)
committerDenys Vlasenko <vda.linux@googlemail.com>
Thu, 1 Nov 2018 12:58:16 +0000 (13:58 +0100)
function                                             old     new   delta
busybox_main                                         624     642     +18

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
libbb/appletlib.c

index 92d99fbe85e9ca4d24ae2d514ff54de5f70aac5a..d48b2ea606e12e4fa7324442a7b6dc5e8afe80e9 100644 (file)
@@ -839,24 +839,30 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
                        "Currently defined functions:\n"
                );
                col = 0;
-               a = applet_names;
                /* prevent last comma to be in the very last pos */
                output_width--;
-               while (*a) {
-                       int len2 = strlen(a) + 2;
-                       if (col >= (int)output_width - len2) {
-                               full_write2_str(",\n");
-                               col = 0;
-                       }
-                       if (col == 0) {
-                               col = 6;
-                               full_write2_str("\t");
-                       } else {
-                               full_write2_str(", ");
+               a = applet_names;
+               {
+#  if NUM_SCRIPTS > 0
+                       int i;
+                       for (i = 0; i < 2; i++, a = script_names)
+#  endif
+                       while (*a) {
+                               int len2 = strlen(a) + 2;
+                               if (col >= (int)output_width - len2) {
+                                       full_write2_str(",\n");
+                                       col = 0;
+                               }
+                               if (col == 0) {
+                                       col = 6;
+                                       full_write2_str("\t");
+                               } else {
+                                       full_write2_str(", ");
+                               }
+                               full_write2_str(a);
+                               col += len2;
+                               a += len2 - 1;
                        }
-                       full_write2_str(a);
-                       col += len2;
-                       a += len2 - 1;
                }
                full_write2_str("\n");
                return 0;