Added support for ignoring '-g' per GNU ls, thanks to David Vrabel
[oweals/busybox.git] / busybox.c
index 95fee63d6d99b4d153a6da2661c6d993ec394d6b..486ef4d77b0fad777455cd7d1e973e31ba9e8ed7 100644 (file)
--- a/busybox.c
+++ b/busybox.c
@@ -30,14 +30,15 @@ int atexit(void (*__func) (void))
 void *__libc_stack_end;
 #endif
 
-static const struct Applet applets[] = {
+const struct BB_applet applets[] = {
 
+#ifdef BB_AR
+       {"ar", ar_main, _BB_DIR_USR_BIN},
+#endif
 #ifdef BB_BASENAME
        {"basename", basename_main, _BB_DIR_USR_BIN},
 #endif
-#ifdef BB_BUSYBOX
        {"busybox", busybox_main, _BB_DIR_BIN},
-#endif
 #ifdef BB_BLOCK_DEVICE
        {"block_device", block_device_main, _BB_DIR_SBIN},
 #endif
@@ -45,13 +46,13 @@ static const struct Applet applets[] = {
        {"cat", cat_main, _BB_DIR_BIN},
 #endif
 #ifdef BB_CHMOD_CHOWN_CHGRP
-       {"chmod", chmod_chown_chgrp_main, _BB_DIR_BIN},
+       {"chgrp", chmod_chown_chgrp_main, _BB_DIR_BIN},
 #endif
 #ifdef BB_CHMOD_CHOWN_CHGRP
-       {"chown", chmod_chown_chgrp_main, _BB_DIR_BIN},
+       {"chmod", chmod_chown_chgrp_main, _BB_DIR_BIN},
 #endif
 #ifdef BB_CHMOD_CHOWN_CHGRP
-       {"chgrp", chmod_chown_chgrp_main, _BB_DIR_BIN},
+       {"chown", chmod_chown_chgrp_main, _BB_DIR_BIN},
 #endif
 #ifdef BB_CHROOT
        {"chroot", chroot_main, _BB_DIR_SBIN},
@@ -65,12 +66,15 @@ static const struct Applet applets[] = {
 #ifdef BB_CP_MV
        {"cp", cp_mv_main, _BB_DIR_BIN},
 #endif
-#ifdef BB_CP_MV
-       {"mv", cp_mv_main, _BB_DIR_BIN},
+#ifdef BB_CUT
+       {"cut", cut_main, _BB_DIR_USR_BIN},
 #endif
 #ifdef BB_DATE
        {"date", date_main, _BB_DIR_BIN},
 #endif
+#ifdef BB_DC
+       {"dc", dc_main, _BB_DIR_USR_BIN},
+#endif
 #ifdef BB_DD
        {"dd", dd_main, _BB_DIR_BIN},
 #endif
@@ -92,6 +96,9 @@ static const struct Applet applets[] = {
 #ifdef BB_ECHO
        {"echo", echo_main, _BB_DIR_BIN},
 #endif
+#ifdef BB_TRUE_FALSE
+       {"false", false_main, _BB_DIR_BIN},
+#endif
 #ifdef BB_FBSET
        {"fbset", fbset_main, _BB_DIR_USR_SBIN},
 #endif
@@ -113,12 +120,15 @@ static const struct Applet applets[] = {
 #ifdef BB_FSCK_MINIX
        {"fsck.minix", fsck_minix_main, _BB_DIR_SBIN},
 #endif
-#ifdef BB_MKFS_MINIX
-       {"mkfs.minix", mkfs_minix_main, _BB_DIR_SBIN},
-#endif
 #ifdef BB_GREP
        {"grep", grep_main, _BB_DIR_BIN},
 #endif
+#ifdef BB_GUNZIP
+       {"gunzip", gunzip_main, _BB_DIR_BIN},
+#endif
+#ifdef BB_GZIP
+       {"gzip", gzip_main, _BB_DIR_BIN},
+#endif
 #ifdef BB_HALT
        {"halt", halt_main, _BB_DIR_SBIN},
 #endif
@@ -131,15 +141,15 @@ static const struct Applet applets[] = {
 #ifdef BB_HOSTNAME
        {"hostname", hostname_main, _BB_DIR_BIN},
 #endif
+#ifdef BB_ID
+       {"id", id_main, _BB_DIR_USR_BIN},
+#endif
 #ifdef BB_INIT
        {"init", init_main, _BB_DIR_SBIN},
 #endif
 #ifdef BB_INSMOD
        {"insmod", insmod_main, _BB_DIR_SBIN},
 #endif
-#ifdef BB_FEATURE_LINUXRC              //
-       {"linuxrc", init_main, _BB_DIR_ROOT},
-#endif
 #ifdef BB_KILL
        {"kill", kill_main, _BB_DIR_BIN},
 #endif
@@ -149,6 +159,9 @@ static const struct Applet applets[] = {
 #ifdef BB_LENGTH
        {"length", length_main, _BB_DIR_USR_BIN},
 #endif
+#ifdef BB_LINUXRC
+       {"linuxrc", init_main, _BB_DIR_ROOT},
+#endif
 #ifdef BB_LN
        {"ln", ln_main, _BB_DIR_BIN},
 #endif
@@ -161,6 +174,12 @@ static const struct Applet applets[] = {
 #ifdef BB_LOADKMAP
        {"loadkmap", loadkmap_main, _BB_DIR_SBIN},
 #endif
+#ifdef BB_LOGGER
+       {"logger", logger_main, _BB_DIR_USR_BIN},
+#endif
+#ifdef BB_LOGNAME
+       {"logname", logname_main, _BB_DIR_USR_BIN},
+#endif
 #ifdef BB_LS
        {"ls", ls_main, _BB_DIR_BIN},
 #endif
@@ -170,8 +189,8 @@ static const struct Applet applets[] = {
 #ifdef BB_MAKEDEVS
        {"makedevs", makedevs_main, _BB_DIR_SBIN},
 #endif
-#ifdef BB_MATH
-       {"math", math_main, _BB_DIR_USR_BIN},
+#ifdef BB_MD5SUM
+       {"md5sum", md5sum_main, _BB_DIR_USR_BIN},
 #endif
 #ifdef BB_MKDIR
        {"mkdir", mkdir_main, _BB_DIR_BIN},
@@ -179,14 +198,20 @@ static const struct Applet applets[] = {
 #ifdef BB_MKFIFO
        {"mkfifo", mkfifo_main, _BB_DIR_USR_BIN},
 #endif
+#ifdef BB_MKFS_MINIX
+       {"mkfs.minix", mkfs_minix_main, _BB_DIR_SBIN},
+#endif
 #ifdef BB_MKNOD
        {"mknod", mknod_main, _BB_DIR_BIN},
 #endif
 #ifdef BB_MKSWAP
        {"mkswap", mkswap_main, _BB_DIR_SBIN},
 #endif
-#ifdef BB_MNC
-       {"mnc", mnc_main, _BB_DIR_USR_BIN},
+#ifdef BB_MKTEMP
+       {"mktemp", mktemp_main, _BB_DIR_BIN},
+#endif
+#ifdef BB_NC
+       {"nc", nc_main, _BB_DIR_USR_BIN},
 #endif
 #ifdef BB_MORE
        {"more", more_main, _BB_DIR_BIN},
@@ -197,6 +222,9 @@ static const struct Applet applets[] = {
 #ifdef BB_MT
        {"mt", mt_main, _BB_DIR_BIN},
 #endif
+#ifdef BB_CP_MV
+       {"mv", cp_mv_main, _BB_DIR_BIN},
+#endif
 #ifdef BB_NSLOOKUP
        {"nslookup", nslookup_main, _BB_DIR_USR_BIN},
 #endif
@@ -230,15 +258,15 @@ static const struct Applet applets[] = {
 #ifdef BB_SED
        {"sed", sed_main, _BB_DIR_BIN},
 #endif
-#ifdef BB_SH
-       {"sh", shell_main, _BB_DIR_BIN},
+#ifdef BB_SETKEYCODES
+       {"setkeycodes", setkeycodes_main, _BB_DIR_USR_BIN},
 #endif
 #ifdef BB_SFDISK
-       {"fdisk", sfdisk_main, _BB_DIR_SBIN},
-#ifdef BB_SFDISK
-#endif
        {"sfdisk", sfdisk_main, _BB_DIR_SBIN},
 #endif
+#ifdef BB_SH
+       {"sh", shell_main, _BB_DIR_BIN},
+#endif
 #ifdef BB_SLEEP
        {"sleep", sleep_main, _BB_DIR_BIN},
 #endif
@@ -251,12 +279,6 @@ static const struct Applet applets[] = {
 #ifdef BB_SYSLOGD
        {"syslogd", syslogd_main, _BB_DIR_SBIN},
 #endif
-#ifdef BB_LOGGER
-       {"logger", logger_main, _BB_DIR_USR_BIN},
-#endif
-#ifdef BB_LOGNAME
-       {"logname", logname_main, _BB_DIR_USR_BIN},
-#endif
 #ifdef BB_SWAPONOFF
        {"swapon", swap_on_off_main, _BB_DIR_SBIN},
 #endif
@@ -272,9 +294,6 @@ static const struct Applet applets[] = {
 #ifdef BB_TELNET
        {"telnet", telnet_main, _BB_DIR_USR_BIN},
 #endif
-#ifdef BB_TEST
-       {"[", test_main, _BB_DIR_USR_BIN},
-#endif
 #ifdef BB_TEST
        {"test", test_main, _BB_DIR_USR_BIN},
 #endif
@@ -290,9 +309,6 @@ static const struct Applet applets[] = {
 #ifdef BB_TRUE_FALSE
        {"true", true_main, _BB_DIR_BIN},
 #endif
-#ifdef BB_TRUE_FALSE
-       {"false", false_main, _BB_DIR_BIN},
-#endif
 #ifdef BB_TTY
        {"tty", tty_main, _BB_DIR_USR_BIN},
 #endif
@@ -302,18 +318,30 @@ static const struct Applet applets[] = {
 #ifdef BB_UNAME
        {"uname", uname_main, _BB_DIR_BIN},
 #endif
-#ifdef BB_UPTIME
-       {"uptime", uptime_main, _BB_DIR_USR_BIN},
-#endif
 #ifdef BB_UNIQ
-       {"uniq", uniq_main, _BB_DIR_BIN},
+       {"uniq", uniq_main, _BB_DIR_USR_BIN},
 #endif
 #ifdef BB_UPDATE
        {"update", update_main, _BB_DIR_SBIN},
 #endif
+#ifdef BB_UPTIME
+       {"uptime", uptime_main, _BB_DIR_USR_BIN},
+#endif
+#ifdef BB_UUENCODE
+       {"uuencode", uuencode_main, _BB_DIR_USR_BIN},
+#endif
+#ifdef BB_UUDECODE
+       {"uudecode", uudecode_main, _BB_DIR_USR_BIN},
+#endif
+#ifdef BB_USLEEP
+       {"usleep", usleep_main, _BB_DIR_BIN},
+#endif
 #ifdef BB_WC
        {"wc", wc_main, _BB_DIR_USR_BIN},
 #endif
+#ifdef BB_WHICH
+       {"which", which_main, _BB_DIR_USR_BIN},
+#endif
 #ifdef BB_WHOAMI
        {"whoami", whoami_main, _BB_DIR_USR_BIN},
 #endif
@@ -323,22 +351,126 @@ static const struct Applet applets[] = {
 #ifdef BB_GUNZIP
        {"zcat", gunzip_main, _BB_DIR_BIN},
 #endif
-#ifdef BB_GUNZIP
-       {"gunzip", gunzip_main, _BB_DIR_BIN},
-#endif
-#ifdef BB_GZIP
-       {"gzip", gzip_main, _BB_DIR_BIN},
+#ifdef BB_TEST
+       {"[", test_main, _BB_DIR_USR_BIN},
 #endif
        {0}
 };
 
 
+#ifdef BB_FEATURE_INSTALLER
+/* 
+ * directory table
+ *             this should be consistent w/ the enum, internal.h::Location,
+ *             or else...
+ */
+static char* install_dir[] = {
+       "/",
+       "/bin",
+       "/sbin",
+       "/usr/bin",
+       "/usr/sbin",
+};
+
+/* abstract link() */
+typedef int (*__link_f)(const char *, const char *);
+
+/* 
+ * Where in the filesystem is this busybox?
+ * [return]
+ *             malloc'd string w/ full pathname of busybox's location
+ *             NULL on failure
+ */
+static char *busybox_fullpath()
+{
+       pid_t pid;
+       char path[256];
+       char proc[256];
+       int len;
+
+       pid = getpid();
+       sprintf(proc, "/proc/%d/exe", pid);
+       len = readlink(proc, path, 256);
+       if (len != -1) {
+               path[len] = 0;
+       } else {
+               fprintf(stderr, "busybox : %s : %s\n", proc, strerror(errno));
+               return NULL;
+       }
+       return strdup(path);
+}
+
+/* create (sym)links for each applet */
+static int install_links(const char *busybox, int use_symbolic_links)
+{
+       __link_f Link = link;
+
+       char command[256];
+       int i;
+       int rc = 0;
+
+       if (use_symbolic_links) Link = symlink;
+
+       for (i = 0; applets[i].name != NULL; i++) {
+               sprintf (
+                       command, 
+                       "%s/%s", 
+                       install_dir[applets[i].location], 
+                       applets[i].name
+               );
+#if 1
+               rc |= Link(busybox, command);
+#else
+               puts(command);
+#endif
+               if (rc) {
+                       fprintf(stderr,"busybox : %s : %s\n", command, strerror(errno));
+               }
+       }
+       return rc;
+}
+
+#if 0
+int uninstall_links() ?
+#endif
+#endif /* BB_FEATURE_INSTALLER */
+
 
 int main(int argc, char **argv)
 {
        char                            *s;
        char                            *name;
-       const struct Applet     *a              = applets;
+       const struct BB_applet  *a              = applets;
+
+#ifdef BB_FEATURE_INSTALLER    
+       /* 
+        * This style of argument parsing doesn't scale well 
+        * in the event that busybox starts wanting more --options.
+        * If someone has a cleaner approach, by all means implement it.
+        */
+       if (argc > 1 && (strcmp(argv[1], "--install") == 0)) {
+               int use_symbolic_links = 0;
+               int rc = 0;
+               char *busybox;
+
+               /* to use symlinks, or not to use symlinks... */
+               if (argc > 2) {
+                       if ((strcmp(argv[2], "-s") == 0)) { 
+                               use_symbolic_links = 1; 
+                       }
+               }
+
+               /* link */
+               busybox = busybox_fullpath();
+               if (busybox) {
+                       install_links(busybox, use_symbolic_links);
+                       free(busybox);
+               } else {
+                       rc = 1;
+               }
+               return rc;
+       }
+#endif /* BB_FEATURE_INSTALLER */
 
        for (s = name = argv[0]; *s != '\0';) {
                if (*s++ == '/')
@@ -347,20 +479,20 @@ int main(int argc, char **argv)
 
        *argv = name;
 
+#ifdef BB_SH
+       /* Add in a special case hack -- whenever **argv == '-'
+        * (i.e. '-su' or '-sh') always invoke the shell */
+       if (**argv == '-')
+               exit(((*(shell_main)) (argc, argv)));
+#endif
+
        while (a->name != 0) {
                if (strcmp(name, a->name) == 0) {
-                       int status;
-
-                       status = ((*(a->main)) (argc, argv));
-                       if (status < 0) {
-                               fprintf(stderr, "%s: %s\n", a->name, strerror(errno));
-                       }
-                       fprintf(stderr, "\n");
-                       exit(status);
+                       exit(((*(a->main)) (argc, argv)));
                }
                a++;
        }
-       exit(busybox_main(argc, argv));
+       return(busybox_main(argc, argv));
 }
 
 
@@ -372,16 +504,16 @@ int busybox_main(int argc, char **argv)
        argv++;
 
        if (been_there_done_that == 1 || argc < 1) {
-               const struct Applet *a = applets;
+               const struct BB_applet *a = applets;
 
-               fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n",
-                               BB_VER, BB_BT);
-               fprintf(stderr, "Usage: busybox [function] [arguments]...\n");
-               fprintf(stderr, "   or: [function] [arguments]...\n\n");
-               fprintf(stderr,
-                               "\tMost people will create a link to busybox for each\n"
-                               "\tfunction name, and busybox will act like whatever you invoke it as.\n");
-               fprintf(stderr, "\nCurrently defined functions:\n");
+               fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n"
+                               "Usage: busybox [function] [arguments]...\n"
+                               "   or: [function] [arguments]...\n\n"
+                               "\tBusyBox is a multi-call binary that combines many common Unix\n"
+                               "\tutilities into a single executable.  Most people will create a\n"
+                               "\tlink to busybox for each function they wish to use, and BusyBox\n"
+                               "\twill act like whatever it was invoked as.\n" 
+                               "\nCurrently defined functions:\n", BB_VER, BB_BT);
 
                while (a->name != 0) {
                        col +=
@@ -394,11 +526,10 @@ int busybox_main(int argc, char **argv)
                }
                fprintf(stderr, "\n\n");
                exit(-1);
-       } else {
-               /* If we've already been here once, exit now */
-               been_there_done_that = 1;
-               return (main(argc, argv));
        }
+       /* If we've already been here once, exit now */
+       been_there_done_that = 1;
+       return (main(argc, argv));
 }
 
 /*