[src/trunk]: src/usr.bin/script PR/55551 Soumendra Ganguly: Simplify tcgetatt...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e0f2b3bc6d21
branches:  trunk
changeset: 937078:e0f2b3bc6d21
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Aug 08 16:01:35 2020 +0000

description:
PR/55551 Soumendra Ganguly: Simplify tcgetattr error handling.

diffstat:

 usr.bin/script/script.c |  23 ++++++++---------------
 1 files changed, 8 insertions(+), 15 deletions(-)

diffs (51 lines):

diff -r 7dbc7af55ee2 -r e0f2b3bc6d21 usr.bin/script/script.c
--- a/usr.bin/script/script.c   Sat Aug 08 14:59:59 2020 +0000
+++ b/usr.bin/script/script.c   Sat Aug 08 16:01:35 2020 +0000
@@ -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 @@
 #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 @@
 
        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 @@
        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;