projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warning
[oweals/busybox.git]
/
applets.h
diff --git
a/applets.h
b/applets.h
index 8c59507cec8b510160618f033692ee867203ebf4..c3037973d1598494fced9f36382bddd175d6a275 100644
(file)
--- 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)
#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"
#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
#endif
#elif defined(MAKE_LINKS)
# define APPLET(a,b,c) LINK c a
@@
-46,6
+46,9
@@
#ifdef BB_TEST
APPLET_NOUSAGE("[", test_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_TEST
APPLET_NOUSAGE("[", test_main, _BB_DIR_USR_BIN)
#endif
+#ifdef BB_ADJTIMEX
+ APPLET(adjtimex, adjtimex_main, _BB_DIR_SBIN)
+#endif
#ifdef BB_AR
APPLET(ar, ar_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_AR
APPLET(ar, ar_main, _BB_DIR_USR_BIN)
#endif
@@
-128,6
+131,9
@@
#if defined(BB_FEATURE_GREP_EGREP_ALIAS) && defined(BB_GREP)
APPLET_NOUSAGE("egrep", grep_main, _BB_DIR_BIN)
#endif
#if defined(BB_FEATURE_GREP_EGREP_ALIAS) && defined(BB_GREP)
APPLET_NOUSAGE("egrep", grep_main, _BB_DIR_BIN)
#endif
+#ifdef BB_ENV
+ APPLET(env, env_main, _BB_DIR_USR_BIN)
+#endif
#ifdef BB_EXPR
APPLET(expr, expr_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_EXPR
APPLET(expr, expr_main, _BB_DIR_USR_BIN)
#endif
@@
-407,6
+413,9
@@
#ifdef BB_UUENCODE
APPLET(uuencode, uuencode_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_UUENCODE
APPLET(uuencode, uuencode_main, _BB_DIR_USR_BIN)
#endif
+#ifdef BB_VI
+ APPLET(vi, vi_main, _BB_DIR_BIN)
+#endif
#ifdef BB_WATCHDOG
APPLET(watchdog, watchdog_main, _BB_DIR_SBIN)
#endif
#ifdef BB_WATCHDOG
APPLET(watchdog, watchdog_main, _BB_DIR_SBIN)
#endif