CVS commit: src/usr.bin/script

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sat Aug  8 16:01:35 UTC 2020

Modified Files:
        src/usr.bin/script: script.c

Log Message:
PR/55551 Soumendra Ganguly: Simplify tcgetattr error handling.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/script/script.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/script/script.c
diff -u src/usr.bin/script/script.c:1.25 src/usr.bin/script/script.c:1.26
--- src/usr.bin/script/script.c:1.25	Fri Aug  7 09:36:28 2020
+++ src/usr.bin/script/script.c	Sat Aug  8 12:01:35 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: script.c,v 1.25 2020/08/07 13:36:28 christos Exp $	*/
+/*	$NetBSD: script.c,v 1.26 2020/08/08 16:01:35 christos Exp $	*/
 
 /*
  * Copyright (c) 1980, 1992, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
 #if 0
 static char sccsid[] = "@(#)script.c	8.1 (Berkeley) 6/6/93";
 #endif
-__RCSID("$NetBSD: script.c,v 1.25 2020/08/07 13:36:28 christos Exp $");
+__RCSID("$NetBSD: script.c,v 1.26 2020/08/08 16:01:35 christos Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -158,16 +158,10 @@ main(int argc, char *argv[])
 
 	if (tcgetattr(STDIN_FILENO, &tt) == -1 ||
 	    ioctl(STDIN_FILENO, TIOCGWINSZ, &win) == -1) {
-		switch (errno) {
-		case ENOTTY:
-			if (openpty(&master, &slave, NULL, NULL, NULL) == -1)
-				err(EXIT_FAILURE, "openpty");
-			break;
-		case EBADF:
-			err(EXIT_FAILURE, "%d not valid fd", STDIN_FILENO);
-		default: /* errno == EFAULT or EINVAL for ioctl. Not reached in practice. */
-			err(EXIT_FAILURE, "ioctl");
-		}
+		if (errno != ENOTTY) /* For debugger. */
+			err(EXIT_FAILURE, "tcgetattr/ioctl");
+		if (openpty(&master, &slave, NULL, NULL, NULL) == -1)
+			err(EXIT_FAILURE, "openpty");
 	} else {
 		if (openpty(&master, &slave, NULL, &tt, &win) == -1)
 			err(EXIT_FAILURE, "openpty");
@@ -383,9 +377,8 @@ termset(void)
 	struct termios traw;
 
 	if (tcgetattr(STDOUT_FILENO, &tt) == -1) {
-		if (errno == EBADF)
-			err(EXIT_FAILURE, "%d not valid fd", STDOUT_FILENO);
-		/* errno == ENOTTY */
+		if (errno != ENOTTY) /* For debugger. */
+			err(EXIT_FAILURE, "tcgetattr");
 		return;
 	}
 	isterm = 1;