Minor fixes to rmmod. First pass at insmod (not yet working).

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

diff --git a/applets/busybox.c b/applets/busybox.c
index 4849ba0a4351c90c70c7a5abe23abf4365e05a0a..895accd93be7fa44e82efaf0914ee537ba95b35e 100644 (file)
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -27,6 +27,9 @@ static const struct Applet applets[] = {
 #ifdef BB_CLEAR                        //usr/bin
     {"clear", clear_main},
 #endif
+#ifdef BB_CHVT                 //usr/bin
+    {"chvt", chvt_main},
+#endif
 #ifdef BB_CP                   //bin
     {"cp", cp_main},
 #endif
@@ -42,15 +45,27 @@ static const struct Applet applets[] = {
 #ifdef BB_DMESG                        //bin
     {"dmesg", dmesg_main},
 #endif
+#ifdef BB_DU                   //bin
+    {"du", du_main},
+#endif
 #ifdef BB_DUTMP                        //usr/sbin
     {"dutmp", dutmp_main},
 #endif
+#ifdef BB_FBSET                 //usr/sbin
+    {"fbset", fbset_main},
+#endif
 #ifdef BB_FDFLUSH              //bin
     {"fdflush", fdflush_main},
 #endif
 #ifdef BB_FIND                 //usr/bin
     {"find", find_main},
 #endif
+#ifdef BB_FREE                 //usr/bin
+    {"free", free_main},
+#endif
+#ifdef BB_DEALLOCVT                    //usr/bin
+    {"deallocvt", deallocvt_main},
+#endif
 #ifdef BB_FSCK_MINIX           //sbin
     {"fsck.minix", fsck_minix_main},
 #endif
@@ -63,9 +78,21 @@ static const struct Applet applets[] = {
 #ifdef BB_HALT                 //sbin
     {"halt", halt_main},
 #endif
+#ifdef BB_HEAD                 //bin
+    {"head", head_main},
+#endif
+#ifdef BB_HOSTNAME              //bin
+    {"hostname", hostname_main},
+#endif
 #ifdef BB_INIT                 //sbin
     {"init", init_main},
 #endif
+#ifdef BB_INSMOD               //sbin
+    {"insmod", insmod_main},
+#endif
+#ifdef BB_FEATURE_LINUXRC      //
+    {"linuxrc", init_main},
+#endif
 #ifdef BB_KILL                 //bin
     {"kill", kill_main},
 #endif
@@ -84,6 +111,9 @@ static const struct Applet applets[] = {
 #ifdef BB_LS                   //bin
     {"ls", ls_main},
 #endif
+#ifdef BB_LSMOD                        //sbin
+    {"lsmod", lsmod_main},
+#endif
 #ifdef BB_MAKEDEVS             //sbin
     {"makedevs", makedevs_main},
 #endif
@@ -93,6 +123,9 @@ static const struct Applet applets[] = {
 #ifdef BB_MKDIR                        //bin
     {"mkdir", mkdir_main},
 #endif
+#ifdef BB_MKFIFO               //usr/bin
+    {"mkfifo", mkfifo_main},
+#endif
 #ifdef BB_MKNOD                        //bin
     {"mknod", mknod_main},
 #endif
@@ -114,9 +147,18 @@ static const struct Applet applets[] = {
 #ifdef BB_MV                   //bin
     {"mv", mv_main},
 #endif
+#ifdef BB_PING                  //bin
+    {"ping", ping_main},
+#endif
+#ifdef BB_POWEROFF              //sbin
+    {"poweroff", poweroff_main},
+#endif
 #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
@@ -129,22 +171,40 @@ static const struct Applet applets[] = {
 #ifdef BB_RMDIR                        //bin
     {"rmdir", rmdir_main},
 #endif
+#ifdef BB_RMMOD                        //sbin
+    {"rmmod", rmmod_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_SYSLOGD              //sbin
+    {"syslogd", syslogd_main},
+#endif
+#ifdef BB_LOGGER               //usr/bin
+    {"logger", logger_main},
 #endif
 #ifdef BB_SWAPONOFF            //sbin
     {"swapon", swap_on_off_main},
     {"swapoff", swap_on_off_main},
 #endif
-#ifdef BB_SYNC                 //bin
-    {"sync", sync_main},
+#ifdef BB_TAIL                 //usr/bin
+    {"tail", tail_main},
+#endif
+#ifdef BB_TAR                  //bin
+    {"tar", tar_main},
+#endif
+#ifdef BB_TEE                  //bin
+    {"tee", tee_main},
 #endif
 #ifdef BB_TOUCH                        //usr/bin
     {"touch", touch_main},
@@ -153,15 +213,18 @@ static const struct Applet applets[] = {
     {"true", true_main},
     {"false", false_main},
 #endif
+#ifdef BB_UNAME                        //bin
+    {"uname",  uname_main},
+#endif
 #ifdef BB_UMOUNT               //bin
     {"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},
@@ -205,12 +268,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");