rpm2cpio applet by Laurence Anderson

[oweals/busybox.git] / applets.h

diff --git a/applets.h b/applets.h
index bfe13ce9fcb053ba3a6ce3487aa6967be48a1b45..287b29cf2c1397e988f898e1a531c4605ae78eec 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)
-  #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
@@ -46,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
@@ -56,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)
@@ -77,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)
@@ -126,7 +132,10 @@
        APPLET(echo, echo_main, _BB_DIR_BIN)
 #endif
 #if defined(BB_FEATURE_GREP_EGREP_ALIAS) && defined(BB_GREP)
-       APPLET(egrep, grep_main, _BB_DIR_BIN)
+       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)
@@ -263,8 +272,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)
@@ -317,6 +326,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
@@ -407,6 +419,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
@@ -436,7 +451,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