aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Kraai <kraai@debian.org>2001-03-27 21:57:29 +0000
committerMatt Kraai <kraai@debian.org>2001-03-27 21:57:29 +0000
commita2e68fc23319d77789cae6eca899f328d15368a5 (patch)
treee578d9606a12b0d129894e5069d09edc8ebaf3ab
parent5b8939b1472d163c4bdd459554d0a6b329a06d97 (diff)
downloadbusybox-a2e68fc23319d77789cae6eca899f328d15368a5.tar.gz
Change BB_FEATURE_TRIVIAL_HELP to BB_FEATURE_VERBOSE_USAGE (per bug #1130).
-rw-r--r--Config.h5
-rw-r--r--Config.h.Hurd5
-rw-r--r--applets.h10
-rw-r--r--debian/Config.h-deb5
-rw-r--r--debian/Config.h-static5
-rw-r--r--debian/Config.h-udeb5
-rw-r--r--include/applets.h10
7 files changed, 20 insertions, 25 deletions
diff --git a/Config.h b/Config.h
index 9022dd075..423454616 100644
--- a/Config.h
+++ b/Config.h
@@ -153,9 +153,8 @@
// I emailed Linus and this patch will not be going into the stock kernel.
//#define BB_FEATURE_USE_DEVPS_PATCH
//
-// This compiles out everything but the most
-// trivial --help usage information (i.e. reduces binary size)
-#define BB_FEATURE_TRIVIAL_HELP
+// show verbose usage messages
+//#define BB_FEATURE_VERBOSE_USAGE
//
// Use termios to manipulate the screen ('more' is prettier with this on)
//#define BB_FEATURE_USE_TERMIOS
diff --git a/Config.h.Hurd b/Config.h.Hurd
index 8ae9f9f1b..369e376cd 100644
--- a/Config.h.Hurd
+++ b/Config.h.Hurd
@@ -144,9 +144,8 @@
// at the same time...
#define BB_FEATURE_USE_PROCFS
//
-// This compiles out everything but the most
-// trivial --help usage information (i.e. reduces binary size)
-//#define BB_FEATURE_TRIVIAL_HELP
+// show verbose usage messages
+#define BB_FEATURE_VERBOSE_USAGE
//
// Use termios to manipulate the screen ('more' is prettier with this on)
#define BB_FEATURE_USE_TERMIOS
diff --git a/applets.h b/applets.h
index 2af2b49e7..0ab296312 100644
--- a/applets.h
+++ b/applets.h
@@ -21,14 +21,14 @@
#define APPLET_ODDNAME(a,b,c,d) extern int b(int argc, char **argv);
extern const char usage_messages[];
#elif defined(MAKE_USAGE)
- #ifdef BB_FEATURE_TRIVIAL_HELP
- #define APPLET(a,b,c) a##_trivial_usage "\0"
- #define APPLET_NOUSAGE(a,b,c) "\0"
- #define APPLET_ODDNAME(a,b,c,d) d##_trivial_usage "\0"
- #else
+ #ifdef BB_FEATURE_VERBOSE_USAGE
#define APPLET(a,b,c) a##_trivial_usage "\n\n" a##_full_usage "\0"
#define APPLET_NOUSAGE(a,b,c) "\0"
#define APPLET_ODDNAME(a,b,c,d) d##_trivial_usage "\n\n" d##_full_usage "\0"
+ #else
+ #define APPLET(a,b,c) a##_trivial_usage "\0"
+ #define APPLET_NOUSAGE(a,b,c) "\0"
+ #define APPLET_ODDNAME(a,b,c,d) d##_trivial_usage "\0"
#endif
#elif defined(MAKE_LINKS)
# define APPLET(a,b,c) LINK c a
diff --git a/debian/Config.h-deb b/debian/Config.h-deb
index edce191c8..075e23557 100644
--- a/debian/Config.h-deb
+++ b/debian/Config.h-deb
@@ -152,9 +152,8 @@
// I emailed Linus and this patch will not be going into the stock kernel.
//#define BB_FEATURE_USE_DEVPS_PATCH
//
-// This compiles out everything but the most
-// trivial --help usage information (i.e. reduces binary size)
-#define BB_FEATURE_TRIVIAL_HELP
+// show verbose usage messages
+//#define BB_FEATURE_VERBOSE_USAGE
//
// Use termios to manipulate the screen ('more' is prettier with this on)
#define BB_FEATURE_USE_TERMIOS
diff --git a/debian/Config.h-static b/debian/Config.h-static
index aa634beaa..fc89e329d 100644
--- a/debian/Config.h-static
+++ b/debian/Config.h-static
@@ -152,9 +152,8 @@
// I emailed Linus and this patch will not be going into the stock kernel.
//#define BB_FEATURE_USE_DEVPS_PATCH
//
-// This compiles out everything but the most
-// trivial --help usage information (i.e. reduces binary size)
-//#define BB_FEATURE_TRIVIAL_HELP
+// show verbose usage messages
+#define BB_FEATURE_VERBOSE_USAGE
//
// Use termios to manipulate the screen ('more' is prettier with this on)
#define BB_FEATURE_USE_TERMIOS
diff --git a/debian/Config.h-udeb b/debian/Config.h-udeb
index c13edaf4d..4028a71da 100644
--- a/debian/Config.h-udeb
+++ b/debian/Config.h-udeb
@@ -152,9 +152,8 @@
// I emailed Linus and this patch will not be going into the stock kernel.
//#define BB_FEATURE_USE_DEVPS_PATCH
//
-// This compiles out everything but the most
-// trivial --help usage information (i.e. reduces binary size)
-#define BB_FEATURE_TRIVIAL_HELP
+// show verbose usage messages
+//#define BB_FEATURE_VERBOSE_USAGE
//
// Use termios to manipulate the screen ('more' is prettier with this on)
#define BB_FEATURE_USE_TERMIOS
diff --git a/include/applets.h b/include/applets.h
index 2af2b49e7..0ab296312 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -21,14 +21,14 @@
#define APPLET_ODDNAME(a,b,c,d) extern int b(int argc, char **argv);
extern const char usage_messages[];
#elif defined(MAKE_USAGE)
- #ifdef BB_FEATURE_TRIVIAL_HELP
- #define APPLET(a,b,c) a##_trivial_usage "\0"
- #define APPLET_NOUSAGE(a,b,c) "\0"
- #define APPLET_ODDNAME(a,b,c,d) d##_trivial_usage "\0"
- #else
+ #ifdef BB_FEATURE_VERBOSE_USAGE
#define APPLET(a,b,c) a##_trivial_usage "\n\n" a##_full_usage "\0"
#define APPLET_NOUSAGE(a,b,c) "\0"
#define APPLET_ODDNAME(a,b,c,d) d##_trivial_usage "\n\n" d##_full_usage "\0"
+ #else
+ #define APPLET(a,b,c) a##_trivial_usage "\0"
+ #define APPLET_NOUSAGE(a,b,c) "\0"
+ #define APPLET_ODDNAME(a,b,c,d) d##_trivial_usage "\0"
#endif
#elif defined(MAKE_LINKS)
# define APPLET(a,b,c) LINK c a