diff options
| -rw-r--r-- | Config.h | 5 | ||||
| -rw-r--r-- | Config.h.Hurd | 5 | ||||
| -rw-r--r-- | applets.h | 10 | ||||
| -rw-r--r-- | debian/Config.h-deb | 5 | ||||
| -rw-r--r-- | debian/Config.h-static | 5 | ||||
| -rw-r--r-- | debian/Config.h-udeb | 5 | ||||
| -rw-r--r-- | include/applets.h | 10 |
7 files changed, 20 insertions, 25 deletions
@@ -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 @@ -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 |