wrap bb help output if CONFIG_FEATURE_AUTOWIDTH

This commit is contained in:
Tim Riker 2003-11-07 19:37:20 +00:00
parent 1b1942f93d
commit b1ffba0401

View File

@ -135,6 +135,14 @@ int busybox_main(int argc, char **argv)
/* If we've already been here once, exit now */ /* If we've already been here once, exit now */
if (been_there_done_that == 1 || argc < 1) { if (been_there_done_that == 1 || argc < 1) {
const struct BB_applet *a = applets; const struct BB_applet *a = applets;
int output_width = 60;
#ifdef CONFIG_FEATURE_AUTOWIDTH
/* Obtain the terminal width. */
get_terminal_width_height(0, &output_width, NULL);
/* leading tab and room to wrap */
output_width -= 20;
#endif
fprintf(stderr, "%s\n\n" fprintf(stderr, "%s\n\n"
"Usage: busybox [function] [arguments]...\n" "Usage: busybox [function] [arguments]...\n"
@ -149,7 +157,7 @@ int busybox_main(int argc, char **argv)
col += col +=
fprintf(stderr, "%s%s", ((col == 0) ? "\t" : ", "), fprintf(stderr, "%s%s", ((col == 0) ? "\t" : ", "),
(a++)->name); (a++)->name);
if (col > 60 && a->name != 0) { if (col > output_width && a->name != 0) {
fprintf(stderr, ",\n"); fprintf(stderr, ",\n");
col = 0; col = 0;
} }