From cad5364599eb5062d59e0c397ed638ddd61a8d5d Mon Sep 17 00:00:00 2001 From: Manuel Novoa III Date: Wed, 19 Mar 2003 09:13:01 +0000 Subject: Major coreutils update. --- coreutils/tty.c | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) (limited to 'coreutils/tty.c') diff --git a/coreutils/tty.c b/coreutils/tty.c index 4510c2996..cd2c784fd 100644 --- a/coreutils/tty.c +++ b/coreutils/tty.c @@ -1,8 +1,8 @@ /* vi: set sw=4 ts=4: */ /* - * Mini tty implementation for busybox + * tty implementation for busybox * - * Copyright (C) 2000 Edward Betts . + * Copyright (C) 2003 Manuel Novoa III * * 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 @@ -20,25 +20,39 @@ * */ +/* BB_AUDIT SUSv3 compliant */ +/* http://www.opengroup.org/onlinepubs/007904975/utilities/tty.html */ + #include #include #include -#include #include "busybox.h" extern int tty_main(int argc, char **argv) { - 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; + int silent; /* Note: No longer relevant in SUSv3. */ + int retval; + + bb_default_error_retval = 2; /* SUSv3 requires > 1 for error. */ + + silent = bb_getopt_ulflags(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; + } + + if (!silent) { + puts(s); } - return(isatty(0) ? EXIT_SUCCESS : EXIT_FAILURE); + + bb_fflush_stdout_and_exit(retval); } -- cgit v1.2.3