aboutsummaryrefslogtreecommitdiff
path: root/toys
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2007-10-11 15:36:36 -0500
committerRob Landley <rob@landley.net>2007-10-11 15:36:36 -0500
commitd06c58df5c723594c4f214dd5d1842a178d2a5e1 (patch)
tree82d61cb9ff7de99de7702e6f8d7cf5d4ecca7bed /toys
parent103b7e031c4de0f9753e02d2217aa81819242278 (diff)
downloadtoybox-d06c58df5c723594c4f214dd5d1842a178d2a5e1.tar.gz
Promote help to global config option, teach error_exit() to output usage message when called
from get_optflags().
Diffstat (limited to 'toys')
-rw-r--r--toys/Config.in16
-rw-r--r--toys/help.c2
2 files changed, 1 insertions, 17 deletions
diff --git a/toys/Config.in b/toys/Config.in
index 8c3017cd..e0454229 100644
--- a/toys/Config.in
+++ b/toys/Config.in
@@ -101,22 +101,6 @@ config HELLO
help
A hello world program. You don't need this.
-config HELP
- bool "help"
- default y
- help
- usage: help [command]
-
- Show usage information for toybox commands.
-
-config HELP_LONG
- bool "Verbose help text"
- default y
- depends on HELP
- help
- Show more than one line of help information per command.
-
-
config MDEV
bool "mdev"
default n
diff --git a/toys/help.c b/toys/help.c
index 6af743fc..4687d0ec 100644
--- a/toys/help.c
+++ b/toys/help.c
@@ -28,6 +28,6 @@ int help_main(void)
s = help_data;
}
- printf("%s", s);
+ fprintf(toys.exithelp ? stderr : stdout, "%s", s);
return 0;
}