Update internal.h to conditionally include asm/string.h

[oweals/busybox.git] / uname.c

diff --git a/uname.c b/uname.c
index 9a1cb808aa56d62b28ee30d49d1fcf5d69a4c3a5..b7c88ece5f458b51375511e2299f4a105e06df8a 100644 (file)
--- a/uname.c
+++ b/uname.c
@@ -42,8 +42,9 @@
 
 
 static const char uname_usage[] =
-       "uname [OPTION]...\n\n"
-       "Print certain system information.  With no OPTION, same as -s.\n\n"
+       "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"
@@ -52,7 +53,9 @@ static const char uname_usage[] =
        "\t-s\tprint the operating system name\n"
 
        "\t-p\tprint the host processor type\n"
-       "\t-v\tprint the operating system version\n";
+       "\t-v\tprint the operating system version\n"
+#endif
+       ;
 
 
 static void print_element(unsigned int mask, char *element);
@@ -153,7 +156,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',