ls: do not follow links with -s (closes bug 33),

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

diff --git a/coreutils/tty.c b/coreutils/tty.c
index d71d8dedb3acf12966f67bb96fdcde17f4863887..d49fb50b6ec2063cd33d2e487dff779d951e4745 100644 (file)
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -1,44 +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"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/tty.html */
 
-extern int tty_main(int argc, char **argv)
+#include "libbb.h"
+
+int tty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int tty_main(int argc, char **argv SKIP_INCLUDE_SUSv2(UNUSED_PARAM))
 {
-       char *tty;
-
-       if (argc > 1) {
-               if (argv[1][0] != '-' || argv[1][1] != 's')
-                       show_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(argv, "s");)
+       USE_INCLUDE_SUSv2(argc -= optind;)
+       SKIP_INCLUDE_SUSv2(argc -= 1;)
+
+       /* gnu tty outputs a warning that it is ignoring all args. */
+       bb_warn_ignoring_args(argc);
+
+       retval = 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;
        }
-       return(isatty(0) ? EXIT_SUCCESS : EXIT_FAILURE);
+       USE_INCLUDE_SUSv2(if (!silent) puts(s);)
+       SKIP_INCLUDE_SUSv2(puts(s);)
+
+       fflush_stdout_and_exit(retval);
 }