Fix xargs option parsing
[oweals/busybox.git] / busybox.c
index e454bb6ec495275da6e0609952b7370c1027840e..f9237744c5f305d7dd6d221cb95a937b0c077d3a 100644 (file)
--- a/busybox.c
+++ b/busybox.c
 #include <string.h>
 #include <errno.h>
 
-static int been_there_done_that = 0;
+#define bb_need_full_version
+#define BB_DECLARE_EXTERN
+#include "messages.c"
 
-/* It has been alledged that doing such things can
- * help reduce binary size when staticly linking,
- * of course with glibc, this is unlikely as long
- * as we use things like printf -- perhaps a printf
- * replacement may be in order 
- */
-#if 0
-void exit(int status) __attribute__ ((noreturn));
-void exit(int status)
-{
-       _exit(status);
-};
-void abort(void) __attribute__ ((__noreturn__));
-void abort(void)
-{
-       _exit(0);
-};
-int atexit(void (*__func) (void))
-{
-       _exit(0);
-};
-void *__libc_stack_end;
-#endif
+static int been_there_done_that = 0;
 
 const struct BB_applet applets[] = {
 
 #ifdef BB_AR
-       {"ar", ar_main, _BB_DIR_USR_BIN},
+       {"ar", ar_main, _BB_DIR_USR_BIN, ar_usage},
 #endif
 #ifdef BB_BASENAME
-       {"basename", basename_main, _BB_DIR_USR_BIN},
-#endif
-       {"busybox", busybox_main, _BB_DIR_BIN},
-#ifdef BB_BLOCK_DEVICE
-       {"block_device", block_device_main, _BB_DIR_SBIN},
+       {"basename", basename_main, _BB_DIR_USR_BIN, basename_usage},
 #endif
+       {"busybox", busybox_main, _BB_DIR_BIN, NULL},
 #ifdef BB_CAT
-       {"cat", cat_main, _BB_DIR_BIN},
+       {"cat", cat_main, _BB_DIR_BIN, cat_usage},
 #endif
 #ifdef BB_CHMOD_CHOWN_CHGRP
-       {"chgrp", chmod_chown_chgrp_main, _BB_DIR_BIN},
+       {"chgrp", chmod_chown_chgrp_main, _BB_DIR_BIN, chgrp_usage},
 #endif
 #ifdef BB_CHMOD_CHOWN_CHGRP
-       {"chmod", chmod_chown_chgrp_main, _BB_DIR_BIN},
+       {"chmod", chmod_chown_chgrp_main, _BB_DIR_BIN, chmod_usage},
 #endif
 #ifdef BB_CHMOD_CHOWN_CHGRP
-       {"chown", chmod_chown_chgrp_main, _BB_DIR_BIN},
+       {"chown", chmod_chown_chgrp_main, _BB_DIR_BIN, chown_usage},
 #endif
 #ifdef BB_CHROOT
-       {"chroot", chroot_main, _BB_DIR_SBIN},
+       {"chroot", chroot_main, _BB_DIR_USR_SBIN, chroot_usage},
 #endif
 #ifdef BB_CLEAR
-       {"clear", clear_main, _BB_DIR_USR_BIN},
+       {"clear", clear_main, _BB_DIR_USR_BIN, clear_usage},
 #endif
 #ifdef BB_CHVT
-       {"chvt", chvt_main, _BB_DIR_USR_BIN},
+       {"chvt", chvt_main, _BB_DIR_USR_BIN, chvt_usage},
 #endif
 #ifdef BB_CP_MV
-       {"cp", cp_mv_main, _BB_DIR_BIN},
+       {"cp", cp_mv_main, _BB_DIR_BIN, cp_usage},
 #endif
 #ifdef BB_CUT
-       {"cut", cut_main, _BB_DIR_USR_BIN},
+       {"cut", cut_main, _BB_DIR_USR_BIN, cut_usage},
 #endif
 #ifdef BB_DATE
-       {"date", date_main, _BB_DIR_BIN},
+       {"date", date_main, _BB_DIR_BIN, date_usage},
 #endif
 #ifdef BB_DC
-       {"dc", dc_main, _BB_DIR_USR_BIN},
+       {"dc", dc_main, _BB_DIR_USR_BIN, dc_usage},
 #endif
 #ifdef BB_DD
-       {"dd", dd_main, _BB_DIR_BIN},
+       {"dd", dd_main, _BB_DIR_BIN, dd_usage},
 #endif
 #ifdef BB_DF
-       {"df", df_main, _BB_DIR_BIN},
+       {"df", df_main, _BB_DIR_BIN, df_usage},
 #endif
 #ifdef BB_DIRNAME
-       {"dirname", dirname_main, _BB_DIR_USR_BIN},
+       {"dirname", dirname_main, _BB_DIR_USR_BIN, dirname_usage},
 #endif
 #ifdef BB_DMESG
-       {"dmesg", dmesg_main, _BB_DIR_BIN},
+       {"dmesg", dmesg_main, _BB_DIR_BIN, dmesg_usage},
+#endif
+#ifdef BB_DOS2UNIX
+       {"dos2unix", dos2unix_main, _BB_DIR_USR_BIN, dos2unix_usage},
 #endif
 #ifdef BB_DU
-       {"du", du_main, _BB_DIR_BIN},
+       {"du", du_main, _BB_DIR_USR_BIN, du_usage},
+#endif
+#ifdef BB_DUMPKMAP
+       {"dumpkmap", dumpkmap_main, _BB_DIR_BIN, dumpkmap_usage},
 #endif
 #ifdef BB_DUTMP
-       {"dutmp", dutmp_main, _BB_DIR_USR_SBIN},
+       {"dutmp", dutmp_main, _BB_DIR_USR_SBIN, dutmp_usage},
 #endif
 #ifdef BB_ECHO
-       {"echo", echo_main, _BB_DIR_BIN},
+       {"echo", echo_main, _BB_DIR_BIN, echo_usage},
+#endif
+#ifdef BB_EXPR
+       {"expr", expr_main, _BB_DIR_USR_BIN, expr_usage},
 #endif
 #ifdef BB_TRUE_FALSE
-       {"false", false_main, _BB_DIR_BIN},
+       {"false", false_main, _BB_DIR_BIN, false_usage},
 #endif
 #ifdef BB_FBSET
-       {"fbset", fbset_main, _BB_DIR_USR_SBIN},
+       {"fbset", fbset_main, _BB_DIR_USR_SBIN, NULL},
 #endif
 #ifdef BB_FDFLUSH
-       {"fdflush", fdflush_main, _BB_DIR_BIN},
+       {"fdflush", fdflush_main, _BB_DIR_BIN, fdflush_usage},
 #endif
 #ifdef BB_FIND
-       {"find", find_main, _BB_DIR_USR_BIN},
+       {"find", find_main, _BB_DIR_USR_BIN, find_usage},
 #endif
 #ifdef BB_FREE
-       {"free", free_main, _BB_DIR_USR_BIN},
+       {"free", free_main, _BB_DIR_USR_BIN, free_usage},
 #endif
 #ifdef BB_FREERAMDISK
-       {"freeramdisk", freeramdisk_main, _BB_DIR_SBIN},
+       {"freeramdisk", freeramdisk_main, _BB_DIR_SBIN, freeramdisk_usage},
 #endif
 #ifdef BB_DEALLOCVT
-       {"deallocvt", deallocvt_main, _BB_DIR_USR_BIN},
+       {"deallocvt", deallocvt_main, _BB_DIR_USR_BIN, deallocvt_usage},
 #endif
 #ifdef BB_FSCK_MINIX
-       {"fsck.minix", fsck_minix_main, _BB_DIR_SBIN},
+       {"fsck.minix", fsck_minix_main, _BB_DIR_SBIN, fsck_minix_usage},
+#endif
+#ifdef BB_GETOPT
+       {"getopt", getopt_main, _BB_DIR_BIN},
 #endif
 #ifdef BB_GREP
-       {"grep", grep_main, _BB_DIR_BIN},
+       {"grep", grep_main, _BB_DIR_BIN, grep_usage},
 #endif
 #ifdef BB_GUNZIP
-       {"gunzip", gunzip_main, _BB_DIR_BIN},
+       {"gunzip", gunzip_main, _BB_DIR_BIN, gunzip_usage},
 #endif
 #ifdef BB_GZIP
-       {"gzip", gzip_main, _BB_DIR_BIN},
+       {"gzip", gzip_main, _BB_DIR_BIN, gzip_usage},
 #endif
 #ifdef BB_HALT
-       {"halt", halt_main, _BB_DIR_SBIN},
+       {"halt", halt_main, _BB_DIR_SBIN, halt_usage},
 #endif
 #ifdef BB_HEAD
-       {"head", head_main, _BB_DIR_BIN},
+       {"head", head_main, _BB_DIR_USR_BIN, head_usage},
 #endif
 #ifdef BB_HOSTID
-       {"hostid", hostid_main, _BB_DIR_USR_BIN},
+       {"hostid", hostid_main, _BB_DIR_USR_BIN, hostid_usage},
 #endif
 #ifdef BB_HOSTNAME
-       {"hostname", hostname_main, _BB_DIR_BIN},
+       {"hostname", hostname_main, _BB_DIR_BIN, hostname_usage},
 #endif
 #ifdef BB_ID
-       {"id", id_main, _BB_DIR_USR_BIN},
+       {"id", id_main, _BB_DIR_USR_BIN, id_usage},
 #endif
 #ifdef BB_INIT
-       {"init", init_main, _BB_DIR_SBIN},
+       {"init", init_main, _BB_DIR_SBIN, NULL},
 #endif
 #ifdef BB_INSMOD
-       {"insmod", insmod_main, _BB_DIR_SBIN},
+       {"insmod", insmod_main, _BB_DIR_SBIN, insmod_usage},
 #endif
 #ifdef BB_KILL
-       {"kill", kill_main, _BB_DIR_BIN},
+       {"kill", kill_main, _BB_DIR_BIN, kill_usage},
 #endif
 #ifdef BB_KILLALL
-       {"killall", kill_main, _BB_DIR_USR_BIN},
+       {"killall", kill_main, _BB_DIR_USR_BIN, kill_usage},
 #endif
 #ifdef BB_LENGTH
-       {"length", length_main, _BB_DIR_USR_BIN},
+       {"length", length_main, _BB_DIR_USR_BIN, length_usage},
 #endif
 #ifdef BB_LINUXRC
-       {"linuxrc", init_main, _BB_DIR_ROOT},
+       {"linuxrc", init_main, _BB_DIR_ROOT, NULL},
 #endif
 #ifdef BB_LN
-       {"ln", ln_main, _BB_DIR_BIN},
+       {"ln", ln_main, _BB_DIR_BIN, ln_usage},
 #endif
 #ifdef BB_LOADACM
-       {"loadacm", loadacm_main, _BB_DIR_USR_BIN},
+       {"loadacm", loadacm_main, _BB_DIR_USR_BIN, loadacm_usage},
 #endif
 #ifdef BB_LOADFONT
-       {"loadfont", loadfont_main, _BB_DIR_USR_BIN},
+       {"loadfont", loadfont_main, _BB_DIR_USR_BIN, loadfont_usage},
 #endif
 #ifdef BB_LOADKMAP
-       {"loadkmap", loadkmap_main, _BB_DIR_SBIN},
+       {"loadkmap", loadkmap_main, _BB_DIR_SBIN, loadkmap_usage},
 #endif
 #ifdef BB_LOGGER
-       {"logger", logger_main, _BB_DIR_USR_BIN},
+       {"logger", logger_main, _BB_DIR_USR_BIN, logger_usage},
 #endif
 #ifdef BB_LOGNAME
-       {"logname", logname_main, _BB_DIR_USR_BIN},
+       {"logname", logname_main, _BB_DIR_USR_BIN, logname_usage},
 #endif
 #ifdef BB_LS
-       {"ls", ls_main, _BB_DIR_BIN},
+       {"ls", ls_main, _BB_DIR_BIN, ls_usage},
 #endif
 #ifdef BB_LSMOD
-       {"lsmod", lsmod_main, _BB_DIR_SBIN},
+       {"lsmod", lsmod_main, _BB_DIR_SBIN, lsmod_usage},
 #endif
 #ifdef BB_MAKEDEVS
-       {"makedevs", makedevs_main, _BB_DIR_SBIN},
+       {"makedevs", makedevs_main, _BB_DIR_SBIN, makedevs_usage},
 #endif
 #ifdef BB_MD5SUM
-       {"md5sum", md5sum_main, _BB_DIR_USR_BIN},
+       {"md5sum", md5sum_main, _BB_DIR_USR_BIN, md5sum_usage},
 #endif
 #ifdef BB_MKDIR
-       {"mkdir", mkdir_main, _BB_DIR_BIN},
+       {"mkdir", mkdir_main, _BB_DIR_BIN, mkdir_usage},
 #endif
 #ifdef BB_MKFIFO
-       {"mkfifo", mkfifo_main, _BB_DIR_USR_BIN},
+       {"mkfifo", mkfifo_main, _BB_DIR_USR_BIN, mkfifo_usage},
 #endif
 #ifdef BB_MKFS_MINIX
-       {"mkfs.minix", mkfs_minix_main, _BB_DIR_SBIN},
+       {"mkfs.minix", mkfs_minix_main, _BB_DIR_SBIN, mkfs_minix_usage},
 #endif
 #ifdef BB_MKNOD
-       {"mknod", mknod_main, _BB_DIR_BIN},
+       {"mknod", mknod_main, _BB_DIR_BIN, mknod_usage},
 #endif
 #ifdef BB_MKSWAP
-       {"mkswap", mkswap_main, _BB_DIR_SBIN},
+       {"mkswap", mkswap_main, _BB_DIR_SBIN, mkswap_usage},
 #endif
 #ifdef BB_MKTEMP
-       {"mktemp", mktemp_main, _BB_DIR_BIN},
+       {"mktemp", mktemp_main, _BB_DIR_BIN, mktemp_usage},
 #endif
 #ifdef BB_NC
-       {"nc", nc_main, _BB_DIR_USR_BIN},
+       {"nc", nc_main, _BB_DIR_USR_BIN, nc_usage},
 #endif
 #ifdef BB_MORE
-       {"more", more_main, _BB_DIR_BIN},
+       {"more", more_main, _BB_DIR_BIN, more_usage},
 #endif
 #ifdef BB_MOUNT
-       {"mount", mount_main, _BB_DIR_BIN},
+       {"mount", mount_main, _BB_DIR_BIN, mount_usage},
 #endif
 #ifdef BB_MT
-       {"mt", mt_main, _BB_DIR_BIN},
+       {"mt", mt_main, _BB_DIR_BIN, mt_usage},
 #endif
 #ifdef BB_CP_MV
-       {"mv", cp_mv_main, _BB_DIR_BIN},
+       {"mv", cp_mv_main, _BB_DIR_BIN, mv_usage},
 #endif
 #ifdef BB_NSLOOKUP
-       {"nslookup", nslookup_main, _BB_DIR_USR_BIN},
+       {"nslookup", nslookup_main, _BB_DIR_USR_BIN, nslookup_usage},
 #endif
 #ifdef BB_PING
-       {"ping", ping_main, _BB_DIR_BIN},
+       {"ping", ping_main, _BB_DIR_BIN, ping_usage},
 #endif
 #ifdef BB_POWEROFF
-       {"poweroff", poweroff_main, _BB_DIR_SBIN},
+       {"poweroff", poweroff_main, _BB_DIR_SBIN, poweroff_usage},
 #endif
 #ifdef BB_PRINTF
-       {"printf", printf_main, _BB_DIR_USR_BIN},
+       {"printf", printf_main, _BB_DIR_USR_BIN, printf_usage},
 #endif
 #ifdef BB_PS
-       {"ps", ps_main, _BB_DIR_BIN},
+       {"ps", ps_main, _BB_DIR_BIN, ps_usage},
 #endif
 #ifdef BB_PWD
-       {"pwd", pwd_main, _BB_DIR_BIN},
+       {"pwd", pwd_main, _BB_DIR_BIN, pwd_usage},
+#endif
+#ifdef BB_RDATE
+       {"rdate", rdate_main, _BB_DIR_USR_BIN, rdate_usage},
 #endif
 #ifdef BB_REBOOT
-       {"reboot", reboot_main, _BB_DIR_SBIN},
+       {"reboot", reboot_main, _BB_DIR_SBIN, reboot_usage},
+#endif
+#ifdef BB_RENICE
+       {"renice", renice_main, _BB_DIR_USR_BIN},
+#endif
+#ifdef BB_RESET
+       {"reset", reset_main, _BB_DIR_USR_BIN, reset_usage},
 #endif
 #ifdef BB_RM
-       {"rm", rm_main, _BB_DIR_BIN},
+       {"rm", rm_main, _BB_DIR_BIN, rm_usage},
 #endif
 #ifdef BB_RMDIR
-       {"rmdir", rmdir_main, _BB_DIR_BIN},
+       {"rmdir", rmdir_main, _BB_DIR_BIN, rmdir_usage},
 #endif
 #ifdef BB_RMMOD
-       {"rmmod", rmmod_main, _BB_DIR_SBIN},
+       {"rmmod", rmmod_main, _BB_DIR_SBIN, rmmod_usage},
 #endif
 #ifdef BB_SED
-       {"sed", sed_main, _BB_DIR_BIN},
+       {"sed", sed_main, _BB_DIR_BIN, sed_usage},
 #endif
 #ifdef BB_SETKEYCODES
-       {"setkeycodes", setkeycodes_main, _BB_DIR_USR_BIN},
-#endif
-#ifdef BB_SFDISK
-       {"sfdisk", sfdisk_main, _BB_DIR_SBIN},
+       {"setkeycodes", setkeycodes_main, _BB_DIR_USR_BIN, setkeycodes_usage},
 #endif
 #ifdef BB_SH
-       {"sh", shell_main, _BB_DIR_BIN},
+       {"sh", shell_main, _BB_DIR_BIN, shell_usage},
 #endif
 #ifdef BB_SLEEP
-       {"sleep", sleep_main, _BB_DIR_BIN},
+       {"sleep", sleep_main, _BB_DIR_BIN, sleep_usage},
 #endif
 #ifdef BB_SORT
-       {"sort", sort_main, _BB_DIR_BIN},
+       {"sort", sort_main, _BB_DIR_USR_BIN, sort_usage},
 #endif
 #ifdef BB_SYNC
-       {"sync", sync_main, _BB_DIR_BIN},
+       {"sync", sync_main, _BB_DIR_BIN, sync_usage},
 #endif
 #ifdef BB_SYSLOGD
-       {"syslogd", syslogd_main, _BB_DIR_SBIN},
+       {"syslogd", syslogd_main, _BB_DIR_SBIN, syslogd_usage},
 #endif
 #ifdef BB_SWAPONOFF
-       {"swapon", swap_on_off_main, _BB_DIR_SBIN},
+       {"swapon", swap_on_off_main, _BB_DIR_SBIN, swapon_usage},
 #endif
 #ifdef BB_SWAPONOFF
-       {"swapoff", swap_on_off_main, _BB_DIR_SBIN},
+       {"swapoff", swap_on_off_main, _BB_DIR_SBIN, swapoff_usage},
 #endif
 #ifdef BB_TAIL
-       {"tail", tail_main, _BB_DIR_USR_BIN},
+       {"tail", tail_main, _BB_DIR_USR_BIN, tail_usage},
 #endif
 #ifdef BB_TAR
-       {"tar", tar_main, _BB_DIR_BIN},
+       {"tar", tar_main, _BB_DIR_BIN, tar_usage},
 #endif
 #ifdef BB_TELNET
-       {"telnet", telnet_main, _BB_DIR_USR_BIN},
+       {"telnet", telnet_main, _BB_DIR_USR_BIN, telnet_usage},
 #endif
 #ifdef BB_TEST
-       {"test", test_main, _BB_DIR_USR_BIN},
+       {"test", test_main, _BB_DIR_USR_BIN, test_usage},
 #endif
 #ifdef BB_TEE
-       {"tee", tee_main, _BB_DIR_BIN},
+       {"tee", tee_main, _BB_DIR_USR_BIN, tee_usage},
 #endif
 #ifdef BB_TOUCH
-       {"touch", touch_main, _BB_DIR_USR_BIN},
+       {"touch", touch_main, _BB_DIR_BIN, touch_usage},
 #endif
 #ifdef BB_TR
-       {"tr", tr_main, _BB_DIR_USR_BIN},
+       {"tr", tr_main, _BB_DIR_USR_BIN, tr_usage},
 #endif
 #ifdef BB_TRUE_FALSE
-       {"true", true_main, _BB_DIR_BIN},
+       {"true", true_main, _BB_DIR_BIN, true_usage},
 #endif
 #ifdef BB_TTY
-       {"tty", tty_main, _BB_DIR_USR_BIN},
+       {"tty", tty_main, _BB_DIR_USR_BIN, tty_usage},
 #endif
 #ifdef BB_UMOUNT
-       {"umount", umount_main, _BB_DIR_BIN},
+       {"umount", umount_main, _BB_DIR_BIN, umount_usage},
 #endif
 #ifdef BB_UNAME
-       {"uname", uname_main, _BB_DIR_BIN},
+       {"uname", uname_main, _BB_DIR_BIN, uname_usage},
 #endif
 #ifdef BB_UNIQ
-       {"uniq", uniq_main, _BB_DIR_USR_BIN},
+       {"uniq", uniq_main, _BB_DIR_USR_BIN, uniq_usage},
+#endif
+#ifdef BB_UNIX2DOS
+       {"unix2dos", unix2dos_main, _BB_DIR_USR_BIN, unix2dos_usage},
+#endif
+#ifdef BB_UNRPM
+       {"unrpm", unrpm_main, _BB_DIR_USR_BIN, unrpm_usage},
 #endif
 #ifdef BB_UPDATE
-       {"update", update_main, _BB_DIR_SBIN},
+       {"update", update_main, _BB_DIR_SBIN, update_usage},
 #endif
 #ifdef BB_UPTIME
-       {"uptime", uptime_main, _BB_DIR_USR_BIN},
+       {"uptime", uptime_main, _BB_DIR_USR_BIN, uptime_usage},
 #endif
 #ifdef BB_UUENCODE
-       {"uuencode", uuencode_main, _BB_DIR_USR_BIN},
+       {"uuencode", uuencode_main, _BB_DIR_USR_BIN, uuencode_usage},
 #endif
 #ifdef BB_UUDECODE
-       {"uudecode", uudecode_main, _BB_DIR_USR_BIN},
+       {"uudecode", uudecode_main, _BB_DIR_USR_BIN, uudecode_usage},
 #endif
 #ifdef BB_USLEEP
-       {"usleep", usleep_main, _BB_DIR_BIN},
+       {"usleep", usleep_main, _BB_DIR_BIN, usleep_usage},
 #endif
 #ifdef BB_WC
-       {"wc", wc_main, _BB_DIR_USR_BIN},
+       {"wc", wc_main, _BB_DIR_USR_BIN, wc_usage},
+#endif
+#ifdef BB_WGET
+       {"wget", wget_main, _BB_DIR_USR_BIN, wget_usage},
 #endif
 #ifdef BB_WHICH
-       {"which", which_main, _BB_DIR_USR_BIN},
+       {"which", which_main, _BB_DIR_USR_BIN, which_usage},
 #endif
 #ifdef BB_WHOAMI
-       {"whoami", whoami_main, _BB_DIR_USR_BIN},
+       {"whoami", whoami_main, _BB_DIR_USR_BIN, whoami_usage},
+#endif
+#ifdef BB_XARGS
+       {"xargs", xargs_main, _BB_DIR_USR_BIN, xargs_usage},
 #endif
 #ifdef BB_YES
-       {"yes", yes_main, _BB_DIR_USR_BIN},
+       {"yes", yes_main, _BB_DIR_USR_BIN, yes_usage},
 #endif
 #ifdef BB_GUNZIP
-       {"zcat", gunzip_main, _BB_DIR_BIN},
+       {"zcat", gunzip_main, _BB_DIR_BIN, gunzip_usage},
 #endif
 #ifdef BB_TEST
-       {"[", test_main, _BB_DIR_USR_BIN},
+       {"[", test_main, _BB_DIR_USR_BIN, test_usage},
 #endif
-       {0}
+       {0,NULL,0,NULL}
 };
 
+const char *applet_name;
 
 #ifdef BB_FEATURE_INSTALLER
 /* 
  * directory table
- *      this should be consistent w/ the enum, internal.h::Location,
- *      or else...
+ *             this should be consistent w/ the enum, internal.h::Location,
+ *             or else...
  */
 static char* install_dir[] = {
-    "/",
-    "/bin",
-    "/sbin",
-    "/usr/bin",
-    "/usr/sbin",
-       NULL
+       "/",
+       "/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 {
+               errorMsg("%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;
+       __link_f Link = link;
 
-    char       command[256];
-       int             i;
-       int             rc = 0;
+       char command[256];
+       int i;
+       int rc = 0;
 
        if (use_symbolic_links) Link = symlink;
 
-    for (i = 0; applets[i].name != NULL; i++) {
-        sprintf (
+       for (i = 0; applets[i].name != NULL; i++) {
+               sprintf (
                        command, 
                        "%s/%s", 
                        install_dir[applets[i].location], 
                        applets[i].name
                );
-#if 0
-        rc |= Link(busybox, command);
+#if 1
+               rc |= Link(busybox, command);
 #else
-        puts(command);
+               puts(command);
 #endif
                if (rc) {
-                       fprintf(stderr,"busybox : %s : %s\n", command, strerror(errno));
-                       break;
+                       errorMsg("%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 char                              *s;
        const struct BB_applet  *a              = applets;
+       applet_name = "busybox";
 
 #ifdef BB_FEATURE_INSTALLER    
        /* 
@@ -427,6 +455,8 @@ int main(int argc, char **argv)
         */
        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) {
@@ -434,25 +464,38 @@ int main(int argc, char **argv)
                                use_symbolic_links = 1; 
                        }
                }
-               /* 
-                * FIXME : 
-                * I need a clever unix trick that'll tell
-                * me where to find the currently running
-                * busybox binary
-                */
-               return install_links("/bin/busybox", use_symbolic_links);
+
+               /* 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';) {
+       for (s = applet_name = argv[0]; *s != '\0';) {
                if (*s++ == '/')
-                       name = s;
+                       applet_name = s;
        }
 
-       *argv = name;
+       *argv = (char*)applet_name;
+
+#ifdef BB_SH
+       /* Add in a special case hack -- whenever **argv == '-'
+        * (i.e. '-su' or '-sh') always invoke the shell */
+       if (**argv == '-' && *(*argv+1)!= '-') {
+               exit(((*(shell_main)) (argc, argv)));
+       }
+#endif
 
        while (a->name != 0) {
-               if (strcmp(name, a->name) == 0) {
+               if (strcmp(applet_name, a->name) == 0) {
+                       if (a->usage && argv[1] && strcmp(argv[1], "--help") == 0)
+                               usage(a->usage);
                        exit(((*(a->main)) (argc, argv)));
                }
                a++;
@@ -471,14 +514,14 @@ int busybox_main(int argc, char **argv)
        if (been_there_done_that == 1 || argc < 1) {
                const struct BB_applet *a = applets;
 
-               fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n"
+               fprintf(stderr, "%s\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);
+                               "\nCurrently defined functions:\n", full_version);
 
                while (a->name != 0) {
                        col +=