inetd: comment tweak. no code changes

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

diff --git a/coreutils/tty.c b/coreutils/tty.c
index 48e15117c27e2075a845e5d77828648a5c4d2dd4..74a4ea3d606f0deebc770a8e8ecf87b8afa4989c 100644 (file)
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -13,32 +13,32 @@
 #include "libbb.h"
 
 int tty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int tty_main(int argc, char **argv SKIP_INCLUDE_SUSv2(ATTRIBUTE_UNUSED))
+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(argv, "s");)
-       USE_INCLUDE_SUSv2(argc -= optind;)
-       SKIP_INCLUDE_SUSv2(argc -= 1;)
+       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);
 
        retval = 0;
 
-       s = ttyname(0);
+       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);
 }