inetd: comment tweak. no code changes

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

diff --git a/coreutils/tty.c b/coreutils/tty.c
index 6aea7a30fdd5ee07b7b207b9bd8fe676c46a1971..74a4ea3d606f0deebc770a8e8ecf87b8afa4989c 100644 (file)
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -4,55 +4,41 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /* 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;
-       int silent;             /* Note: No longer relevant in SUSv3. */
+       IF_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");
+       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;
        }
+       IF_INCLUDE_SUSv2(if (!silent) puts(s);)
+       IF_NOT_INCLUDE_SUSv2(puts(s);)
 
-       if (!silent) {
-               puts(s);
-       }
-
-       bb_fflush_stdout_and_exit(retval);
+       fflush_stdout_and_exit(retval);
 }