X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=applets%2Fbusybox.c;h=895accd93be7fa44e82efaf0914ee537ba95b35e;hb=6da0ae8183a31d4faab745d534a363c7e66ef864;hp=3af98407d2f8188e51445d78bad4e024901f7e98;hpb=a3f09076ef5e9a2c26b4d0728cd066bba6c474e4;p=oweals%2Fbusybox.git

diff --git a/applets/busybox.c b/applets/busybox.c
index 3af98407d..895accd93 100644
--- 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},
@@ -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,8 +45,14 @@ 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", cat_more_main},
+    {"dutmp", dutmp_main},
+#endif
+#ifdef BB_FBSET                 //usr/sbin
+    {"fbset", fbset_main},
 #endif
 #ifdef BB_FDFLUSH		//bin
     {"fdflush", fdflush_main},
@@ -51,15 +60,39 @@ static const struct Applet applets[] = {
 #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
+#ifdef BB_MKFS_MINIX		//sbin
+    {"mkfs.minix", mkfs_minix_main},
+#endif
 #ifdef BB_GREP			//bin
     {"grep", grep_main},
 #endif
 #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
@@ -78,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
@@ -87,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
@@ -108,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
@@ -123,18 +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},
@@ -143,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},
@@ -195,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");