- add libbb function str_tolower to convert a string to lowercase.

[oweals/busybox.git] / coreutils / tty.c

diff --git a/coreutils/tty.c b/coreutils/tty.c
index 924aff2d54c52fea688f0010be1a92c72c6fbaa7..c28aa33d7144c371994cf2e1aa22740186ab8e10 100644 (file)
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -15,15 +15,16 @@
 #include <unistd.h>
 #include "busybox.h"
 
+int tty_main(int argc, char **argv);
 int tty_main(int argc, char **argv)
 {
        const char *s;
-       int silent;             /* Note: No longer relevant in SUSv3. */
+       USE_INCLUDE_SUSv2(int silent;)  /* Note: No longer relevant in SUSv3. */
        int retval;
 
-       bb_default_error_retval = 2;    /* SUSv3 requires > 1 for error. */
+       xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */
 
-       silent = bb_getopt_ulflags(argc, argv, "s");
+       USE_INCLUDE_SUSv2(silent = getopt32(argc, argv, "s");)
 
        /* gnu tty outputs a warning that it is ignoring all args. */
        bb_warn_ignoring_args(argc - optind);
@@ -36,10 +37,8 @@ int tty_main(int argc, char **argv)
                s = "not a tty";
                retval = 1;
        }
+       USE_INCLUDE_SUSv2(if (!silent) puts(s);)
+       SKIP_INCLUDE_SUSv2(puts(s);)
 
-       if (!silent) {
-               puts(s);
-       }
-
-       bb_fflush_stdout_and_exit(retval);
+       fflush_stdout_and_exit(retval);
 }