X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Ftty.c;h=c28aa33d7144c371994cf2e1aa22740186ab8e10;hb=ec1a4b5a521b5adf295bc757c25231910f8c854b;hp=6eebed9fbc3a444e62d00c8253c07949e219fb78;hpb=3570a34de46b1f7dedd16999bb1687e2d6b55d40;p=oweals%2Fbusybox.git

diff --git a/coreutils/tty.c b/coreutils/tty.c
index 6eebed9fb..c28aa33d7 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -1,42 +1,44 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Mini tty implementation for busybox
+ * tty implementation for busybox
  *
- * Copyright (C) 2000  Edward Betts <edward@debian.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
+ * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/tty.html */
+
 #include <stdio.h>
-#include <sys/types.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "busybox.h"
 
-extern int tty_main(int argc, char **argv)
+int tty_main(int argc, char **argv);
+int tty_main(int argc, char **argv)
 {
-	char *tty;
-
-	if (argc > 1) {
-		if (argv[1][0] != '-' || argv[1][1] != 's')
-			usage(tty_usage);
-	} else {
-		tty = ttyname(0);
-		if (tty)
-			puts(tty);
-		else
-			puts("not a tty");
+	const char *s;
+	USE_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");)
+
+	/* gnu tty outputs a warning that it is ignoring all args. */
+	bb_warn_ignoring_args(argc - optind);
+
+	retval = 0;
+
+	if ((s = ttyname(0)) == NULL) {
+	/* According to SUSv3, ttyname can on fail with EBADF or ENOTTY.
+	 * We know the file descriptor is good, so failure means not a tty. */
+		s = "not a tty";
+		retval = 1;
 	}
-	return(isatty(0) ? TRUE : FALSE);
+	USE_INCLUDE_SUSv2(if (!silent) puts(s);)
+	SKIP_INCLUDE_SUSv2(puts(s);)
+
+	fflush_stdout_and_exit(retval);
 }