Remove misguided klude around for 2.4.x-test* brokenness. Al Viro

[oweals/busybox.git] / tty.c

diff --git a/tty.c b/tty.c
index 8ac1c1fcd1d28501c08612aeb5dbf86bae3451e3..f3c7fb74f5ceefb3297a839c6b170ebfd1a6da3f 100644 (file)
--- a/tty.c
+++ b/tty.c
@@ -24,10 +24,13 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-static const char tty_usage[] = "tty\n\n"
-       "Print the file name of the terminal connected to standard input.\n"
-
-       "\t-s\tprint nothing, only return an exit status\n";
+static const char tty_usage[] = "tty\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nPrint the file name of the terminal connected to standard input.\n\n"
+       "Options:\n"
+       "\t-s\tprint nothing, only return an exit status\n"
+#endif
+       ;
 
 extern int tty_main(int argc, char **argv)
 {
@@ -43,5 +46,5 @@ extern int tty_main(int argc, char **argv)
                else
                        puts("not a tty");
        }
-       exit(isatty(0) ? TRUE : FALSE);
+       return(isatty(0) ? TRUE : FALSE);
 }