Fix some bugs reported by Jim Gleason <jimg@lineo.com> and others I

[oweals/busybox.git] / uname.c

diff --git a/uname.c b/uname.c
index 981ac69ed2dcfa824125a506641de0f9f316aed3..8d9427c8649c82a50ce296e9352c39b41e534eab 100644 (file)
--- a/uname.c
+++ b/uname.c
@@ -31,7 +31,7 @@
 
 /* Busyboxed by Erik Andersen */
 
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
@@ -40,24 +40,6 @@
 # include <sys/systeminfo.h>
 #endif
 
-
-static const char uname_usage[] =
-       "uname [OPTION]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nPrint certain system information.  With no OPTION, same as -s.\n\n"
-       "Options:\n"
-       "\t-a\tprint all information\n"
-       "\t-m\tthe machine (hardware) type\n"
-       "\t-n\tprint the machine's network node hostname\n"
-       "\t-r\tprint the operating system release\n"
-       "\t-s\tprint the operating system name\n"
-
-       "\t-p\tprint the host processor type\n"
-       "\t-v\tprint the operating system version\n"
-#endif
-       ;
-
-
 static void print_element(unsigned int mask, char *element);
 
 /* Values that are bitwise or'd into `toprint'. */
@@ -156,7 +138,7 @@ int uname_main(int argc, char **argv)
        print_element(PRINT_MACHINE, name.machine);
        print_element(PRINT_PROCESSOR, processor);
 
-       exit(TRUE);
+       return(TRUE);
 }
 
 /* If the name element set in MASK is selected for printing in `toprint',