From 7b0ea0a21fb2d97c7bd24987f8ccf27548c0b004 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 28 Oct 2020 17:03:37 -0500 Subject: Tweak help text again. --- Config.in | 2 -- lib/help.c | 5 +++++ main.c | 4 ++-- toys/other/help.c | 13 +++++++------ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Config.in b/Config.in index aced2ab9..f7407d85 100644 --- a/Config.in +++ b/Config.in @@ -15,8 +15,6 @@ config TOYBOX help usage: toybox [--long | --help | --version | [COMMAND] [ARGUMENTS...]] - Toybox multicall binary: https://landley.net/toybox/about.html - With no arguments, "toybox" shows available COMMAND names. Add --long to include suggested install path for each command, see https://landley.net/toybox/faq.html#install for details. diff --git a/lib/help.c b/lib/help.c index 86d6392b..cd023026 100644 --- a/lib/help.c +++ b/lib/help.c @@ -21,6 +21,11 @@ void show_help(FILE *out, int full) int i = toys.which-toy_list; char *s, *ss; + if (!(full&2)) + fprintf(out, "Toybox %s" USE_TOYBOX(" multicall binary") + ": https://landley.net/toybox" + USE_TOYBOX(" (see toybox --help)") "\n\n", toybox_version); + if (CFG_TOYBOX_HELP) { for (;;) { s = help_data; diff --git a/main.c b/main.c index ced2a65b..7c60bdf4 100644 --- a/main.c +++ b/main.c @@ -21,7 +21,7 @@ struct toy_list toy_list[] = { struct toy_context toys; union global_union this; -char toybuf[4096], libbuf[4096]; +char *toybox_version = TOYBOX_VERSION, toybuf[4096], libbuf[4096]; struct toy_list *toy_find(char *name) { @@ -84,7 +84,7 @@ void toy_singleinit(struct toy_list *which, char *argv[]) } if (!strcmp(argv[1], "--version")) { - xputs("toybox "TOYBOX_VERSION); + xprintf("toybox %s\n", toybox_version); xexit(); } } diff --git a/toys/other/help.c b/toys/other/help.c index 179dd4e7..ab168c66 100644 --- a/toys/other/help.c +++ b/toys/other/help.c @@ -30,13 +30,13 @@ static void do_help(struct toy_list *t) xprintf("

%s

\n", t->name, t->name);
 
   toys.which = t;
-  show_help(stdout, !FLAG(u));
+  show_help(stdout, FLAG(h)+!FLAG(u));
 
   if (FLAG(h)) xprintf("
\n"); } -// The simple help is just toys.which = toy_find("name"); show_help(stdout); -// But iterating through html output and all commands is a big more +// Simple help is just toys.which = toy_find("name"); show_help(stdout, 1); +// but iterating through html output and all commands is a bit more void help_main(void) { @@ -62,10 +62,11 @@ void help_main(void) } if (FLAG(h)) { - xprintf("\nToybox command list\n\n

\n"); + sprintf(toybuf, "Toybox %s command help", toybox_version); + xprintf("\n%s\n\n

%s

", + toybuf, toybuf); for (i=0; i < toys.toycount; i++) - xprintf("%s\n\n", toy_list[i].name, - toy_list[i].name); + xprintf("%s \n", toy_list[i].name, toy_list[i].name); xprintf("

\n"); } -- cgit v1.2.3