Change BB_FEATURE_TRIVIAL_HELP to BB_FEATURE_VERBOSE_USAGE (per bug #1130).
This commit is contained in:
parent
5b8939b147
commit
a2e68fc233
5
Config.h
5
Config.h
@ -153,9 +153,8 @@
|
|||||||
// I emailed Linus and this patch will not be going into the stock kernel.
|
// I emailed Linus and this patch will not be going into the stock kernel.
|
||||||
//#define BB_FEATURE_USE_DEVPS_PATCH
|
//#define BB_FEATURE_USE_DEVPS_PATCH
|
||||||
//
|
//
|
||||||
// This compiles out everything but the most
|
// show verbose usage messages
|
||||||
// trivial --help usage information (i.e. reduces binary size)
|
//#define BB_FEATURE_VERBOSE_USAGE
|
||||||
#define BB_FEATURE_TRIVIAL_HELP
|
|
||||||
//
|
//
|
||||||
// Use termios to manipulate the screen ('more' is prettier with this on)
|
// Use termios to manipulate the screen ('more' is prettier with this on)
|
||||||
//#define BB_FEATURE_USE_TERMIOS
|
//#define BB_FEATURE_USE_TERMIOS
|
||||||
|
@ -144,9 +144,8 @@
|
|||||||
// at the same time...
|
// at the same time...
|
||||||
#define BB_FEATURE_USE_PROCFS
|
#define BB_FEATURE_USE_PROCFS
|
||||||
//
|
//
|
||||||
// This compiles out everything but the most
|
// show verbose usage messages
|
||||||
// trivial --help usage information (i.e. reduces binary size)
|
#define BB_FEATURE_VERBOSE_USAGE
|
||||||
//#define BB_FEATURE_TRIVIAL_HELP
|
|
||||||
//
|
//
|
||||||
// Use termios to manipulate the screen ('more' is prettier with this on)
|
// Use termios to manipulate the screen ('more' is prettier with this on)
|
||||||
#define BB_FEATURE_USE_TERMIOS
|
#define BB_FEATURE_USE_TERMIOS
|
||||||
|
10
applets.h
10
applets.h
@ -21,14 +21,14 @@
|
|||||||
#define APPLET_ODDNAME(a,b,c,d) extern int b(int argc, char **argv);
|
#define APPLET_ODDNAME(a,b,c,d) extern int b(int argc, char **argv);
|
||||||
extern const char usage_messages[];
|
extern const char usage_messages[];
|
||||||
#elif defined(MAKE_USAGE)
|
#elif defined(MAKE_USAGE)
|
||||||
#ifdef BB_FEATURE_TRIVIAL_HELP
|
#ifdef BB_FEATURE_VERBOSE_USAGE
|
||||||
#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
|
|
||||||
#define APPLET(a,b,c) a##_trivial_usage "\n\n" a##_full_usage "\0"
|
#define APPLET(a,b,c) a##_trivial_usage "\n\n" a##_full_usage "\0"
|
||||||
#define APPLET_NOUSAGE(a,b,c) "\0"
|
#define APPLET_NOUSAGE(a,b,c) "\0"
|
||||||
#define APPLET_ODDNAME(a,b,c,d) d##_trivial_usage "\n\n" d##_full_usage "\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
|
#endif
|
||||||
#elif defined(MAKE_LINKS)
|
#elif defined(MAKE_LINKS)
|
||||||
# define APPLET(a,b,c) LINK c a
|
# define APPLET(a,b,c) LINK c a
|
||||||
|
5
debian/Config.h-deb
vendored
5
debian/Config.h-deb
vendored
@ -152,9 +152,8 @@
|
|||||||
// I emailed Linus and this patch will not be going into the stock kernel.
|
// I emailed Linus and this patch will not be going into the stock kernel.
|
||||||
//#define BB_FEATURE_USE_DEVPS_PATCH
|
//#define BB_FEATURE_USE_DEVPS_PATCH
|
||||||
//
|
//
|
||||||
// This compiles out everything but the most
|
// show verbose usage messages
|
||||||
// trivial --help usage information (i.e. reduces binary size)
|
//#define BB_FEATURE_VERBOSE_USAGE
|
||||||
#define BB_FEATURE_TRIVIAL_HELP
|
|
||||||
//
|
//
|
||||||
// Use termios to manipulate the screen ('more' is prettier with this on)
|
// Use termios to manipulate the screen ('more' is prettier with this on)
|
||||||
#define BB_FEATURE_USE_TERMIOS
|
#define BB_FEATURE_USE_TERMIOS
|
||||||
|
5
debian/Config.h-static
vendored
5
debian/Config.h-static
vendored
@ -152,9 +152,8 @@
|
|||||||
// I emailed Linus and this patch will not be going into the stock kernel.
|
// I emailed Linus and this patch will not be going into the stock kernel.
|
||||||
//#define BB_FEATURE_USE_DEVPS_PATCH
|
//#define BB_FEATURE_USE_DEVPS_PATCH
|
||||||
//
|
//
|
||||||
// This compiles out everything but the most
|
// show verbose usage messages
|
||||||
// trivial --help usage information (i.e. reduces binary size)
|
#define BB_FEATURE_VERBOSE_USAGE
|
||||||
//#define BB_FEATURE_TRIVIAL_HELP
|
|
||||||
//
|
//
|
||||||
// Use termios to manipulate the screen ('more' is prettier with this on)
|
// Use termios to manipulate the screen ('more' is prettier with this on)
|
||||||
#define BB_FEATURE_USE_TERMIOS
|
#define BB_FEATURE_USE_TERMIOS
|
||||||
|
5
debian/Config.h-udeb
vendored
5
debian/Config.h-udeb
vendored
@ -152,9 +152,8 @@
|
|||||||
// I emailed Linus and this patch will not be going into the stock kernel.
|
// I emailed Linus and this patch will not be going into the stock kernel.
|
||||||
//#define BB_FEATURE_USE_DEVPS_PATCH
|
//#define BB_FEATURE_USE_DEVPS_PATCH
|
||||||
//
|
//
|
||||||
// This compiles out everything but the most
|
// show verbose usage messages
|
||||||
// trivial --help usage information (i.e. reduces binary size)
|
//#define BB_FEATURE_VERBOSE_USAGE
|
||||||
#define BB_FEATURE_TRIVIAL_HELP
|
|
||||||
//
|
//
|
||||||
// Use termios to manipulate the screen ('more' is prettier with this on)
|
// Use termios to manipulate the screen ('more' is prettier with this on)
|
||||||
#define BB_FEATURE_USE_TERMIOS
|
#define BB_FEATURE_USE_TERMIOS
|
||||||
|
@ -21,14 +21,14 @@
|
|||||||
#define APPLET_ODDNAME(a,b,c,d) extern int b(int argc, char **argv);
|
#define APPLET_ODDNAME(a,b,c,d) extern int b(int argc, char **argv);
|
||||||
extern const char usage_messages[];
|
extern const char usage_messages[];
|
||||||
#elif defined(MAKE_USAGE)
|
#elif defined(MAKE_USAGE)
|
||||||
#ifdef BB_FEATURE_TRIVIAL_HELP
|
#ifdef BB_FEATURE_VERBOSE_USAGE
|
||||||
#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
|
|
||||||
#define APPLET(a,b,c) a##_trivial_usage "\n\n" a##_full_usage "\0"
|
#define APPLET(a,b,c) a##_trivial_usage "\n\n" a##_full_usage "\0"
|
||||||
#define APPLET_NOUSAGE(a,b,c) "\0"
|
#define APPLET_NOUSAGE(a,b,c) "\0"
|
||||||
#define APPLET_ODDNAME(a,b,c,d) d##_trivial_usage "\n\n" d##_full_usage "\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
|
#endif
|
||||||
#elif defined(MAKE_LINKS)
|
#elif defined(MAKE_LINKS)
|
||||||
# define APPLET(a,b,c) LINK c a
|
# define APPLET(a,b,c) LINK c a
|
||||||
|
Loading…
x
Reference in New Issue
Block a user