diff options
| author | Mikolaj Golub <trociny@FreeBSD.org> | 2014-01-17 21:45:25 +0000 |
|---|---|---|
| committer | Mikolaj Golub <trociny@FreeBSD.org> | 2014-01-17 21:45:25 +0000 |
| commit | 29f4384a31e5e3defd1bbf56fc5a8bcb118a499f (patch) | |
| tree | d86ef850a12e33e6eb6ea8747c6ae89890d52b68 /usr.bin/script/script.c | |
| parent | 3cb44b3f65bfa85b17544103dac2f193f11baae4 (diff) | |
| download | src-29f4384a31e5e3defd1bbf56fc5a8bcb118a499f.tar.gz src-29f4384a31e5e3defd1bbf56fc5a8bcb118a499f.zip | |
Bring back r226403, the fix for bin/161526, which was (accidentally?)
reverted in r238896.
PR: bin/161526
Reported by: Karli.Sjoberg slu.se
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=260833
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 1396d3d1f383..72814fbe17ad 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; } |