X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Ftty.c;h=45175054e2a13509e34c2c98ac9f6ade56534f20;hb=faf7c62f1d66c51e8162e30119bfc06d2bc68f1c;hp=fee4b8b9f09c0c22fb934b5e3a066d961520a156;hpb=1118a1de46cdeb166f256374568f4bc21b5d7449;p=oweals%2Fbusybox.git

diff --git a/coreutils/tty.c b/coreutils/tty.c
index fee4b8b9f..45175054e 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -4,40 +4,53 @@
  *
  * 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 */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
-
-int tty_main(int argc, char **argv)
+/* BB_AUDIT SUSv4 compliant */
+/* http://www.opengroup.org/onlinepubs/9699919799/utilities/tty.html */
+
+//usage:#define tty_trivial_usage
+//usage:       ""
+//usage:#define tty_full_usage "\n\n"
+//usage:       "Print file name of stdin's terminal"
+//usage:	IF_INCLUDE_SUSv2( "\n"
+//usage:     "\n	-s	Print nothing, only return exit status"
+//usage:	)
+//usage:
+//usage:#define tty_example_usage
+//usage:       "$ tty\n"
+//usage:       "/dev/tty2\n"
+
+#include "libbb.h"
+
+int tty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int tty_main(int argc UNUSED_PARAM, char **argv)
 {
 	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. */
+	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(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;
 	}
-	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);
 }