d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

script: Minor cleanups.

Browse Source 
- Instead of using isatty() to decide whether to call tcgetattr(), just
  call tcgetattr() directly, since that's all that isatty() does anyway.
- Simplify error handling in termset().  Check for errno != ENOTTY from
  tcgetattr() to handle errors that may be raised while running
  script(1) under a debugger.

PR:		248377
Submitted by:	Soumendra Ganguly <soumendraganguly@gmail.com>
MFC after:	1 week
This commit is contained in:
Mark Johnston 2020-08-11 14:19:05 +00:00
parent 74d3a63559
commit 8bc30d2afd
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.bin/script/script.c
View File

@ -176,16 +176,16 @@ main(int argc, char *argv[])
if (pflg)
playback(fscript);
if ((ttyflg = isatty(STDIN_FILENO)) != 0) {
if (tcgetattr(STDIN_FILENO, &tt) == -1)
err(1, "tcgetattr");
if (ioctl(STDIN_FILENO, TIOCGWINSZ, &win) == -1)
err(1, "ioctl");
if (openpty(&master, &slave, NULL, &tt, &win) == -1)
err(1, "openpty");
} else {
if (tcgetattr(STDIN_FILENO, &tt) == -1 ||
ioctl(STDIN_FILENO, TIOCGWINSZ, &win) == -1) {
if (errno != ENOTTY) /* For debugger. */
err(1, "tcgetattr/ioctl");
if (openpty(&master, &slave, NULL, NULL, NULL) == -1)
err(1, "openpty");
} else {
if (openpty(&master, &slave, NULL, &tt, &win) == -1)
err(1, "openpty");
ttyflg = 1;
}
if (rawout)
@ -433,9 +433,8 @@ termset(void)
struct termios traw;
if (tcgetattr(STDOUT_FILENO, &tt) == -1) {
if (errno == EBADF)
err(1, "%d not valid fd", STDOUT_FILENO);
/* errno == ENOTTY */
if (errno != ENOTTY) /* For debugger. */
err(1, "tcgetattr");
return;
}
ttyflg = 1;