src/usr.bin/script/script.c - diff

Return to script.c CVS log

Up to [local] / src / usr.bin / script

Diff for /src/usr.bin/script/script.c between version 1.32 and 1.33

version 1.32, 2015/10/20 14:55:21

version 1.33, 2017/04/12 14:49:05

Line 85

volatile sig_atomic_t flush;

struct termios tt;

int istty;

__dead void done(int);

void dooutput(void);

Line 99

Line 100

{

extern char *__progname;

struct sigaction sa;

struct termios rtt;

struct winsize win;

char ibuf[BUFSIZ];

ssize_t cc, off;

Line 126

if ((fscript = fopen(fname, aflg ? "a" : "w")) == NULL)

err(1, "%s", fname);

(void)tcgetattr(STDIN_FILENO, &tt);

if (isatty(0)) {

(void)ioctl(STDIN_FILENO, TIOCGWINSZ, &win);

if (tcgetattr(STDIN_FILENO, &tt) == 0 &&

ioctl(STDIN_FILENO, TIOCGWINSZ, &win) == 0)

istty = 1;

}

if (openpty(&master, &slave, NULL, &tt, &win) == -1)

err(1, "openpty");

(void)printf("Script started, output file is %s\n", fname);

rtt = tt;

if (istty) {

cfmakeraw(&rtt);

struct termios rtt = tt;

rtt.c_lflag &= ~ECHO;

(void)tcsetattr(STDIN_FILENO, TCSAFLUSH, &rtt);

cfmakeraw(&rtt);

rtt.c_lflag &= ~ECHO;

(void)tcsetattr(STDIN_FILENO, TCSAFLUSH, &rtt);

}

bzero(&sa, sizeof sa);

sigemptyset(&sa.sa_mask);

sa.sa_handler = handlesigwinch;

Line 331

Line 337

(void)fclose(fscript);

(void)close(master);

} else {

(void)tcsetattr(STDIN_FILENO, TCSAFLUSH, &tt);

if (istty)

(void)tcsetattr(STDIN_FILENO, TCSAFLUSH, &tt);

(void)printf("Script done, output file is %s\n", fname);

}

exit(eval);