diff options
| author | kaiw <kaiw@FreeBSD.org> | 2014-01-20 19:38:44 +0000 |
|---|---|---|
| committer | kaiw <kaiw@FreeBSD.org> | 2014-01-20 19:38:44 +0000 |
| commit | e9c152dbc2e572c490d3035d77f142253b674ded (patch) | |
| tree | ae65253d09d5b1583a6bb647cd383e77be00e687 /usr.bin/script/script.c | |
| parent | cb3a8568bd4e3f2bf20a1c342c6957d1a568a5df (diff) | |
| parent | 681dcc3c572a6831f4cb5f341c90ea4f9278bc81 (diff) | |
| download | FreeBSD-src-e9c152dbc2e572c490d3035d77f142253b674ded.zip FreeBSD-src-e9c152dbc2e572c490d3035d77f142253b674ded.tar.gz | |
MFH@260917.
Diffstat (limited to 'usr.bin/script/script.c')
| -rw-r--r-- | usr.bin/script/script.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c index 1396d3d..72814fb 100644 --- a/usr.bin/script/script.c +++ b/usr.bin/script/script.c @@ -238,12 +238,15 @@ main(int argc, char *argv[]) FD_SET(master, &rfd); if (readstdin) FD_SET(STDIN_FILENO, &rfd); - if ((!readstdin && ttyflg) || flushtime > 0) { - tv.tv_sec = !readstdin && ttyflg ? 1 : - flushtime - (tvec - start); + if (!readstdin && ttyflg) { + tv.tv_sec = 1; tv.tv_usec = 0; tvp = &tv; readstdin = 1; + } else if (flushtime > 0) { + tv.tv_sec = flushtime - (tvec - start); + tv.tv_usec = 0; + tvp = &tv; } else { tvp = NULL; } |
