aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2018-11-01 13:58:16 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2018-11-01 13:58:16 +0100
commit0575c9932d203d93633104e12054dcf5da522061 (patch)
treef6dbc96f216c5a4095eb33ca5fbc69436a743200
parentc9e161277eae5d2af39704e220ca5652e69bc428 (diff)
downloadbusybox-0575c9932d203d93633104e12054dcf5da522061.tar.gz
busybox: show embedded scripts in applet list
function old new delta busybox_main 624 642 +18 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--libbb/appletlib.c36
1 files changed, 21 insertions, 15 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 92d99fbe8..d48b2ea60 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -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;