Stuf

[oweals/busybox.git] / applets / busybox.c

diff --git a/applets/busybox.c b/applets/busybox.c
index 45365b370d09ae8404f708b3d7585e074be5c26d..af81ad8a2996b15dd8a291a7ab352dedf9f6cd2c 100644 (file)
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -14,7 +14,7 @@ static const struct Applet applets[] = {
     {"block_device", block_device_main},
 #endif
 #ifdef BB_CAT                  //bin
-    {"cat", cat_more_main},
+    {"cat", cat_main},
 #endif
 #ifdef BB_CHMOD_CHOWN_CHGRP    //bin
     {"chmod", chmod_chown_chgrp_main},
@@ -43,10 +43,7 @@ static const struct Applet applets[] = {
     {"dmesg", dmesg_main},
 #endif
 #ifdef BB_DUTMP                        //usr/sbin
-    {"dutmp", cat_more_main},
-#endif
-#ifdef BB_FALSE                        //bin
-    {"false", false_main},
+    {"dutmp", dutmp_main},
 #endif
 #ifdef BB_FDFLUSH              //bin
     {"fdflush", fdflush_main},
@@ -54,6 +51,18 @@ static const struct Applet applets[] = {
 #ifdef BB_FIND                 //usr/bin
     {"find", find_main},
 #endif
+#ifdef BB_CHVT                 //usr/bin
+    {"chvt", chvt_main},
+#endif
+#ifdef BB_DEALLOCVT                    //usr/bin
+    {"deallocvt", deallocvt_main},
+#endif
+#ifdef BB_FSCK_MINIX           //sbin
+    {"fsck.minix", fsck_minix_main},
+#endif
+#ifdef BB_MKFS_MINIX           //sbin
+    {"mkfs.minix", mkfs_minix_main},
+#endif
 #ifdef BB_GREP                 //bin
     {"grep", grep_main},
 #endif
@@ -63,6 +72,9 @@ static const struct Applet applets[] = {
 #ifdef BB_INIT                 //sbin
     {"init", init_main},
 #endif
+#ifdef BB_FEATURE_LINUXRC      //
+    {"linuxrc", init_main},
+#endif
 #ifdef BB_KILL                 //bin
     {"kill", kill_main},
 #endif
@@ -72,12 +84,12 @@ static const struct Applet applets[] = {
 #ifdef BB_LN                   //bin
     {"ln", ln_main},
 #endif
+#ifdef BB_LOADFONT             //usr/bin
+    {"loadfont", loadfont_main},
+#endif
 #ifdef BB_LOADKMAP             //sbin
     {"loadkmap", loadkmap_main},
 #endif
-#ifdef BB_LOSETUP              //sbin
-    {"losetup", losetup_main},
-#endif
 #ifdef BB_LS                   //bin
     {"ls", ls_main},
 #endif
@@ -114,6 +126,9 @@ static const struct Applet applets[] = {
 #ifdef BB_PRINTF               //usr/bin
     {"printf", printf_main},
 #endif
+#ifdef BB_PS                   //bin
+    {"ps", ps_main},
+#endif
 #ifdef BB_PWD                  //bin
     {"pwd", pwd_main},
 #endif
@@ -126,36 +141,51 @@ static const struct Applet applets[] = {
 #ifdef BB_RMDIR                        //bin
     {"rmdir", rmdir_main},
 #endif
+#ifdef BB_SFDISK               //sbin
+    {"fdisk", sfdisk_main},
+    {"sfdisk", sfdisk_main},
+#endif
+#ifdef BB_SED                  //bin
+    {"sed", sed_main},
+#endif
 #ifdef BB_SLEEP                        //bin
     {"sleep", sleep_main},
 #endif
-#ifdef BB_TAR                  //bin
-    {"tar", tar_main},
+#ifdef BB_SYNC                 //bin
+    {"sync", sync_main},
 #endif
-#ifdef BB_SWAPOFF              //sbin
-    {"swapoff", monadic_main},
+#ifdef BB_SYSLOGD              //sbin
+    {"syslogd", syslogd_main},
 #endif
-#ifdef BB_SWAPON               //sbin
-    {"swapon", monadic_main},
+#ifdef BB_LOGGER               //usr/bin
+    {"logger", logger_main},
 #endif
-#ifdef BB_SYNC                 //bin
-    {"sync", sync_main},
+#ifdef BB_SWAPONOFF            //sbin
+    {"swapon", swap_on_off_main},
+    {"swapoff", swap_on_off_main},
+#endif
+#ifdef BB_TAR                  //bin
+    {"tar", tar_main},
 #endif
 #ifdef BB_TOUCH                        //usr/bin
     {"touch", touch_main},
 #endif
-#ifdef BB_TRUE                 //bin
+#ifdef BB_TRUE_FALSE           //bin
     {"true", true_main},
+    {"false", false_main},
+#endif
+#ifdef BB_UNAME                        //bin
+    {"uname",  uname_main},
 #endif
 #ifdef BB_UMOUNT               //bin
-    {"umount", umount_main},
+    {"umount",  umount_main},
 #endif
 #ifdef BB_UPDATE               //sbin
     {"update", update_main},
 #endif
-#ifdef BB_ZCAT                 //bin
-    {"zcat", zcat_main},
-    {"gunzip", zcat_main},
+#ifdef BB_GUNZIP               //bin
+    {"zcat", gunzip_main},
+    {"gunzip", gunzip_main},
 #endif
 #ifdef BB_GZIP                 //bin
     {"gzip", gzip_main},
@@ -199,12 +229,12 @@ int busybox_main(int argc, char **argv)
 
     if (been_there_done_that == 1 || argc < 1) {
        const struct Applet *a = applets;
-       fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n",
+       fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n",
                BB_VER, BB_BT);
-       fprintf(stderr, "\nUsage:\t[function] [arguments]...\n");
-       fprintf(stderr, "\tbusybox [function] [arguments]...\n");
+       fprintf(stderr, "Usage: busybox [function] [arguments]...\n");
+       fprintf(stderr, "   or: [function] [arguments]...\n\n");
        fprintf(stderr,
-               "\n\tMost people will create a symlink to busybox for each\n"
+               "\tMost people will create a symlink to busybox for each\n"
                "\tfunction name, and busybox will act like whatever you invoke it as.\n");
        fprintf(stderr, "\nCurrently defined functions:\n");