lineedit: do not hang on error, but return error indicator.

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

diff --git a/coreutils/tty.c b/coreutils/tty.c
index eb8c3dd0f81d07696ffd20726d6e7b66ec91b42d..489181319f0904db7d04920a89d4aa98260545a7 100644 (file)
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -4,42 +4,41 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-/* BB_AUDIT SUSv3 compliant */
-/* http://www.opengroup.org/onlinepubs/007904975/utilities/tty.html */
+/* BB_AUDIT SUSv4 compliant */
+/* http://www.opengroup.org/onlinepubs/9699919799/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 UNUSED_PARAM, char **argv)
 {
        const char *s;
-       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. */
 
-       silent = bb_getopt_ulflags(argc, argv, "s");
+       IF_INCLUDE_SUSv2(silent = getopt32(argv, "s");)
+       IF_INCLUDE_SUSv2(argv += optind;)
+       IF_NOT_INCLUDE_SUSv2(argv += 1;)
 
        /* gnu tty outputs a warning that it is ignoring all args. */
-       bb_warn_ignoring_args(argc - optind);
+       bb_warn_ignoring_args(argv[0]);
 
-       retval = 0;
+       retval = EXIT_SUCCESS;
 
-       if ((s = ttyname(0)) == NULL) {
-       /* According to SUSv3, ttyname can on fail with EBADF or ENOTTY.
+       s = xmalloc_ttyname(STDIN_FILENO);
+       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;
+               retval = EXIT_FAILURE;
        }
+       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);
 }