Another update from Larry:

[oweals/busybox.git] / applets.h

diff --git a/applets.h b/applets.h
index 0ab296312e6e570b2eeea0d4f19d8e6012228ba7..0fd89c71aa832de3bfa84216c697f9b9d6e1d4ab 100644 (file)
--- a/applets.h
+++ b/applets.h
@@ -59,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)
@@ -80,8 +80,8 @@
 #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_CUT
        APPLET(cut, cut_main, _BB_DIR_USR_BIN)
@@ -131,6 +131,9 @@
 #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
@@ -266,8 +269,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)
@@ -410,6 +413,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