projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make 'grep -l' work
[oweals/busybox.git]
/
applets.h
diff --git
a/applets.h
b/applets.h
index 446906cad3719fb19d5211efc4f7bb4529564548..c3037973d1598494fced9f36382bddd175d6a275 100644
(file)
--- a/
applets.h
+++ b/
applets.h
@@
-21,15
+21,19
@@
#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
#endif
+#elif defined(MAKE_LINKS)
+# define APPLET(a,b,c) LINK c a
+# define APPLET_NOUSAGE(a,b,c) LINK c a
+# define APPLET_ODDNAME(a,b,c,d) LINK c a
#else
const struct BB_applet applets[] = {
#define APPLET(a,b,c) {#a,b,c},
#else
const struct BB_applet applets[] = {
#define APPLET(a,b,c) {#a,b,c},
@@
-42,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
@@
-121,6
+128,12
@@
#ifdef BB_ECHO
APPLET(echo, echo_main, _BB_DIR_BIN)
#endif
#ifdef BB_ECHO
APPLET(echo, echo_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
@@
-128,7
+141,7
@@
APPLET(false, false_main, _BB_DIR_BIN)
#endif
#ifdef BB_FBSET
APPLET(false, false_main, _BB_DIR_BIN)
#endif
#ifdef BB_FBSET
- APPLET
_NOUSAGE("fbset"
, fbset_main, _BB_DIR_USR_SBIN)
+ APPLET
(fbset
, fbset_main, _BB_DIR_USR_SBIN)
#endif
#ifdef BB_FDFLUSH
APPLET(fdflush, fdflush_main, _BB_DIR_BIN)
#endif
#ifdef BB_FDFLUSH
APPLET(fdflush, fdflush_main, _BB_DIR_BIN)
@@
-187,10
+200,13
@@
#ifdef BB_KILLALL
APPLET(killall, kill_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_KILLALL
APPLET(killall, kill_main, _BB_DIR_USR_BIN)
#endif
+#ifdef BB_KLOGD
+ APPLET(klogd, klogd_main, _BB_DIR_SBIN)
+#endif
#ifdef BB_LENGTH
APPLET(length, length_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_LENGTH
APPLET(length, length_main, _BB_DIR_USR_BIN)
#endif
-#ifdef BB_LINUXRC
+#ifdef BB_
FEATURE_
LINUXRC
APPLET_NOUSAGE("linuxrc", init_main, _BB_DIR_ROOT)
#endif
#ifdef BB_LN
APPLET_NOUSAGE("linuxrc", init_main, _BB_DIR_ROOT)
#endif
#ifdef BB_LN
@@
-211,6
+227,9
@@
#ifdef BB_LOGNAME
APPLET(logname, logname_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_LOGNAME
APPLET(logname, logname_main, _BB_DIR_USR_BIN)
#endif
+#ifdef BB_LOGREAD
+ APPLET(logread, logread_main, _BB_DIR_SBIN)
+#endif
#ifdef BB_LS
APPLET(ls, ls_main, _BB_DIR_BIN)
#endif
#ifdef BB_LS
APPLET(ls, ls_main, _BB_DIR_BIN)
#endif
@@
-352,6
+371,9
@@
#ifdef BB_TEST
APPLET(test, test_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_TEST
APPLET(test, test_main, _BB_DIR_USR_BIN)
#endif
+#ifdef BB_TFTP
+ APPLET(tftp, tftp_main, _BB_DIR_USR_BIN)
+#endif
#ifdef BB_TOUCH
APPLET(touch, touch_main, _BB_DIR_BIN)
#endif
#ifdef BB_TOUCH
APPLET(touch, touch_main, _BB_DIR_BIN)
#endif
@@
-374,7
+396,7
@@
APPLET(uniq, uniq_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_UNIX2DOS
APPLET(uniq, uniq_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_UNIX2DOS
- APPLET(unix2dos,
unix2dos
_main, _BB_DIR_USR_BIN)
+ APPLET(unix2dos,
dos2unix
_main, _BB_DIR_USR_BIN)
#endif
#ifdef BB_UPDATE
APPLET(update, update_main, _BB_DIR_SBIN)
#endif
#ifdef BB_UPDATE
APPLET(update, update_main, _BB_DIR_SBIN)
@@
-391,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
@@
-420,7
+445,4
@@
{ 0,NULL,0 }
};
{ 0,NULL,0 }
};
-/* The -1 arises because of the {0,NULL,0,-1} entry above. */
-size_t NUM_APPLETS = (sizeof (applets) / sizeof (struct BB_applet) - 1);
-
#endif
#endif