The following reply was made to PR bin/161526; it has been noted by GNATS. From: [email protected] (dfilter service) To: [email protected] Cc: Subject: Re: bin/161526: commit references a PR Date: Mon, 20 Jan 2014 20:33:53 +0000 (UTC)
Author: trociny Date: Mon Jan 20 20:33:40 2014 New Revision: 260924 URL: http://svnweb.freebsd.org/changeset/base/260924 Log: MFC r260833: Bring back r226403, the fix for bin/161526, which was (accidentally?) reverted in r238896. PR: bin/161526 Reported by: Karli.Sjoberg slu.se Modified: stable/10/usr.bin/script/script.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/script/script.c ============================================================================== --- stable/10/usr.bin/script/script.c Mon Jan 20 20:28:04 2014 (r260923) +++ stable/10/usr.bin/script/script.c Mon Jan 20 20:33:40 2014 (r260924) @@ -235,12 +235,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; } _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "[email protected]" _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "[email protected]"
