PArtial Changelog update. I'm still on vacation (I'm at a campground

[oweals/busybox.git] / include / applets.h

diff --git a/include/applets.h b/include/applets.h
index eaa818df7a9e7a9b9962eaa3da8999b7c84a1321..9fc59cda53c8b8c2463dcb6a3c3e990b418016cd 100644 (file)
--- a/include/applets.h
+++ b/include/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)
-  #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
+#  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},
@@ -42,6 +46,9 @@
 #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
@@ -52,14 +59,14 @@
 #ifdef BB_CAT
        APPLET(cat, cat_main, _BB_DIR_BIN)
 #endif
-#ifdef BB_CHMOD_CHOWN_CHGRP
-       APPLET(chgrp, chmod_chown_chgrp_main, _BB_DIR_BIN)
+#ifdef BB_CHGRP
+       APPLET(chgrp, chgrp_main, _BB_DIR_BIN)
 #endif
-#ifdef BB_CHMOD_CHOWN_CHGRP
-       APPLET(chmod, chmod_chown_chgrp_main, _BB_DIR_BIN)
+#ifdef BB_CHMOD
+       APPLET(chmod, chmod_main, _BB_DIR_BIN)
 #endif
-#ifdef BB_CHMOD_CHOWN_CHGRP
-       APPLET(chown, chmod_chown_chgrp_main, _BB_DIR_BIN)
+#ifdef BB_CHOWN
+       APPLET(chown, chown_main, _BB_DIR_BIN)
 #endif
 #ifdef BB_CHROOT
        APPLET(chroot, chroot_main, _BB_DIR_USR_SBIN)
@@ -73,8 +80,11 @@
 #ifdef BB_CMP
        APPLET(cmp, cmp_main, _BB_DIR_USR_BIN)
 #endif
-#ifdef BB_CP_MV
-       APPLET(cp, cp_mv_main, _BB_DIR_BIN)
+#ifdef BB_CP
+       APPLET(cp, cp_main, _BB_DIR_BIN)
+#endif
+#ifdef BB_CPIO
+       APPLET(cpio, cpio_main, _BB_DIR_BIN)
 #endif
 #ifdef BB_CUT
        APPLET(cut, cut_main, _BB_DIR_USR_BIN)
@@ -121,6 +131,12 @@
 #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
@@ -128,7 +144,7 @@
        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)
@@ -187,10 +203,13 @@
 #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_LINUXRC
+#ifdef BB_FEATURE_LINUXRC
        APPLET_NOUSAGE("linuxrc", init_main, _BB_DIR_ROOT)
 #endif
 #ifdef BB_LN
@@ -211,6 +230,9 @@
 #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
@@ -241,6 +263,9 @@
 #ifdef BB_MKTEMP
        APPLET(mktemp, mktemp_main, _BB_DIR_BIN)
 #endif
+#ifdef BB_MODPROBE
+       APPLET(modprobe, modprobe_main, _BB_DIR_SBIN)
+#endif
 #ifdef BB_MORE
        APPLET(more, more_main, _BB_DIR_BIN)
 #endif
@@ -250,8 +275,8 @@
 #ifdef BB_MT
        APPLET(mt, mt_main, _BB_DIR_BIN)
 #endif
-#ifdef BB_CP_MV
-       APPLET(mv, cp_mv_main, _BB_DIR_BIN)
+#ifdef BB_MV
+       APPLET(mv, mv_main, _BB_DIR_BIN)
 #endif
 #ifdef BB_NC
        APPLET(nc, nc_main, _BB_DIR_USR_BIN)
@@ -304,6 +329,9 @@
 #ifdef BB_ROUTE
        APPLET(route, route_main, _BB_DIR_USR_BIN)
 #endif
+#ifdef BB_RPM2CPIO
+       APPLET(rpm2cpio, rpm2cpio_main, _BB_DIR_USR_BIN)
+#endif
 #ifdef BB_RPMUNPACK
        APPLET(rpmunpack, rpmunpack_main, _BB_DIR_USR_BIN)
 #endif
@@ -352,12 +380,18 @@
 #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_TR
        APPLET(tr, tr_main, _BB_DIR_USR_BIN)
 #endif
+#ifdef BB_TRACEROUTE
+       APPLET(traceroute, traceroute_main, _BB_DIR_USR_BIN)
+#endif
 #ifdef BB_TRUE_FALSE
        APPLET(true, true_main, _BB_DIR_BIN)
 #endif
@@ -391,6 +425,9 @@
 #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
@@ -420,7 +457,4 @@
        { 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