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

Bring back r226403, the fix for bin/161526, which was (accidentally?)

Browse Source 
reverted in r238896.

PR:		bin/161526
Reported by:	Karli.Sjoberg slu.se
MFC after:	3 days
This commit is contained in:
Mikolaj Golub 2014-01-17 21:45:25 +00:00
parent 3cb44b3f65
commit 29f4384a31
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}