diff options
author | Bruce Evans <bde@FreeBSD.org> | 1995-07-04 08:16:32 +0000 |
---|---|---|
committer | Bruce Evans <bde@FreeBSD.org> | 1995-07-04 08:16:32 +0000 |
commit | a7a41dba354d1429c81b50a29b5684d3e33c40d3 (patch) | |
tree | 82d95e42c06a89e9501b2d6b84ae10e2889aaf1b | |
parent | 04c3f9f7abb3c7dd679ecad57dc36ffbb5d8248c (diff) | |
download | src-a7a41dba354d1429c81b50a29b5684d3e33c40d3.tar.gz src-a7a41dba354d1429c81b50a29b5684d3e33c40d3.zip |
Improve the recently changed and an old error message: don't report probe
errors.
Notes
Notes:
svn path=/head/; revision=9393
-rw-r--r-- | bin/stty/stty.c | 8 | ||||
-rw-r--r-- | bin/stty/util.c | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/bin/stty/stty.c b/bin/stty/stty.c index 9d9f67970b07..0f5e92582033 100644 --- a/bin/stty/stty.c +++ b/bin/stty/stty.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: stty.c,v 1.4 1995/05/30 00:07:28 rgrimes Exp $ + * $Id: stty.c,v 1.5 1995/07/02 08:54:27 joerg Exp $ */ #ifndef lint @@ -95,10 +95,8 @@ main(argc, argv) args: argc -= optind; argv += optind; - if (tcgetattr(i.fd, &i.t) < 0) { - warn("tcgetattr: not running on a terminal"); - exit(1); - } + if (tcgetattr(i.fd, &i.t) < 0) + errx(1, "stdin isn't a terminal"); if (ioctl(i.fd, TIOCGETD, &i.ldisc) < 0) err(1, "TIOCGETD"); if (ioctl(i.fd, TIOCGWINSZ, &i.win) < 0) diff --git a/bin/stty/util.c b/bin/stty/util.c index 2ee43ca58d2c..036c48eb1f16 100644 --- a/bin/stty/util.c +++ b/bin/stty/util.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: util.c,v 1.2 1994/09/24 02:59:05 davidg Exp $ */ #ifndef lint @@ -62,5 +62,5 @@ checkredirect() if (isatty(STDOUT_FILENO) && isatty(STDERR_FILENO) && !fstat(STDOUT_FILENO, &sb1) && !fstat(STDERR_FILENO, &sb2) && (sb1.st_rdev != sb2.st_rdev)) -warn("stdout appears redirected, but stdin is the control descriptor"); +warnx("stdout appears redirected, but stdin is the control descriptor"); } |