Better way to check for namespace aliasing.

[oweals/busybox.git] / busybox.c

diff --git a/busybox.c b/busybox.c
index cd4ab8fcd9675f2a0b224a3d27712421da8e73e6..67485de8d51c0c7e68d112172d0226b32eaec924 100644 (file)
--- a/busybox.c
+++ b/busybox.c
@@ -3,8 +3,28 @@
 #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); };
+void abort (void) __attribute__ ((__noreturn__));
+void abort (void) { _exit(0); };
+int atexit (void (*__func) (void)) { _exit(0); };
+void *__libc_stack_end;
+#endif
+
+
 static const struct Applet applets[] = {
 
 #ifdef BB_BUSYBOX              //bin
@@ -81,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
@@ -102,6 +125,9 @@ static const struct Applet applets[] = {
 #ifdef BB_LN                   //bin
     {"ln", ln_main},
 #endif
+#ifdef BB_LOADACM               //usr/bin
+    {"loadacm", loadacm_main},
+#endif    
 #ifdef BB_LOADFONT             //usr/bin
     {"loadfont", loadfont_main},
 #endif
@@ -196,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},
@@ -216,15 +245,30 @@ static const struct Applet applets[] = {
     {"true", true_main},
     {"false", false_main},
 #endif
+#ifdef BB_TTY                  //usr/bin
+    {"tty", tty_main},
+#endif
 #ifdef BB_UNAME                        //bin
     {"uname",  uname_main},
 #endif
 #ifdef BB_UMOUNT               //bin
     {"umount",  umount_main},
 #endif
+#ifdef BB_UNIQ                 //bin
+    {"uniq", uniq_main},
+#endif
 #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},
@@ -235,6 +279,8 @@ static const struct Applet applets[] = {
     {0}
 };
 
+
+
 int main(int argc, char **argv)
 {
     char *s = argv[0];