From 2d44811a6f396ee3ec192ae0d51819c1c7ea3f22 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Tue, 4 Jul 1995 08:16:32 +0000
Subject: [PATCH] Improve the recently changed and an old error message: don't
 report probe errors.

---
 bin/stty/stty.c | 8 +++-----
 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");
 }