inetd: comment tweak. no code changes

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

diff --git a/coreutils/tty.c b/coreutils/tty.c
index fee4b8b9f09c0c22fb934b5e3a066d961520a156..74a4ea3d606f0deebc770a8e8ecf87b8afa4989c 100644 (file)
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -10,34 +10,35 @@
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/tty.html */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
-int tty_main(int argc, char **argv)
+int tty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int tty_main(int argc, char **argv IF_NOT_INCLUDE_SUSv2(UNUSED_PARAM))
 {
        const char *s;
-       USE_INCLUDE_SUSv2(int silent;)  /* Note: No longer relevant in SUSv3. */
+       IF_INCLUDE_SUSv2(int silent;)   /* Note: No longer relevant in SUSv3. */
        int retval;
 
        xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */
 
-       USE_INCLUDE_SUSv2(silent = getopt32(argc, argv, "s");)
+       IF_INCLUDE_SUSv2(silent = getopt32(argv, "s");)
+       IF_INCLUDE_SUSv2(argc -= optind;)
+       IF_NOT_INCLUDE_SUSv2(argc -= 1;)
 
        /* gnu tty outputs a warning that it is ignoring all args. */
-       bb_warn_ignoring_args(argc - optind);
+       bb_warn_ignoring_args(argc);
 
        retval = 0;
 
-       if ((s = ttyname(0)) == NULL) {
-       /* According to SUSv3, ttyname can on fail with EBADF or ENOTTY.
+       s = xmalloc_ttyname(0);
+       if (s == NULL) {
+       /* According to SUSv3, ttyname can fail with EBADF or ENOTTY.
         * We know the file descriptor is good, so failure means not a tty. */
                s = "not a tty";
                retval = 1;
        }
-       USE_INCLUDE_SUSv2(if (!silent) puts(s);)
-       SKIP_INCLUDE_SUSv2(puts(s);)
+       IF_INCLUDE_SUSv2(if (!silent) puts(s);)
+       IF_NOT_INCLUDE_SUSv2(puts(s);)
 
        fflush_stdout_and_exit(retval);
 }