diff options
author | Erik Andersen <andersen@codepoet.org> | 2000-01-15 22:28:50 +0000 |
---|---|---|
committer | Erik Andersen <andersen@codepoet.org> | 2000-01-15 22:28:50 +0000 |
commit | 3163821967821518cfa4c4315f775ec5301bb023 (patch) | |
tree | fe0c764cb41cc3ea86c3dcd270e48fa6a1abebcd /applets | |
parent | b7cc49d992ed9a5a59261096012e0b4a811bb7f4 (diff) | |
download | busybox-3163821967821518cfa4c4315f775ec5301bb023.tar.gz |
Sync up busybox with the latest and greatest. This is not stuff for
the Embedix release.
-Erik
Diffstat (limited to 'applets')
-rw-r--r-- | applets/busybox.c | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/applets/busybox.c b/applets/busybox.c index a00f90be0..67485de8d 100644 --- a/applets/busybox.c +++ b/applets/busybox.c @@ -3,8 +3,18 @@ #include <string.h> #include <errno.h> +#ifndef BB_INIT +#undef BB_FEATURE_LINUXRC +#endif + static int been_there_done_that = 0; +/* 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); }; @@ -91,6 +101,9 @@ static const struct Applet applets[] = { #ifdef BB_HEAD //bin {"head", head_main}, #endif +#ifdef BB_HOSTID //usr/bin + {"hostid", hostid_main}, +#endif #ifdef BB_HOSTNAME //bin {"hostname", hostname_main}, #endif @@ -209,6 +222,9 @@ static const struct Applet applets[] = { #ifdef BB_LOGGER //usr/bin {"logger", logger_main}, #endif +#ifdef BB_LOGNAME //usr/bin + {"logname", logname_main}, +#endif #ifdef BB_SWAPONOFF //sbin {"swapon", swap_on_off_main}, {"swapoff", swap_on_off_main}, @@ -229,8 +245,8 @@ static const struct Applet applets[] = { {"true", true_main}, {"false", false_main}, #endif -#ifdef BB_WC //usr/bin - {"wc", wc_main}, +#ifdef BB_TTY //usr/bin + {"tty", tty_main}, #endif #ifdef BB_UNAME //bin {"uname", uname_main}, @@ -244,6 +260,15 @@ static const struct Applet applets[] = { #ifdef BB_UPDATE //sbin {"update", update_main}, #endif +#ifdef BB_WC //usr/bin + {"wc", wc_main}, +#endif +#ifdef BB_WHOAMI //usr/bin + {"whoami", whoami_main}, +#endif +#ifdef BB_YES //usr/bin + {"yes", yes_main}, +#endif #ifdef BB_GUNZIP //bin {"zcat", gunzip_main}, {"gunzip", gunzip_main}, |