svn commit: r260833 - head/usr.bin/script

[Mikolaj Golub]

Author: trociny
Date: Fri Jan 17 21:45:25 2014
New Revision: 260833
URL: http://svnweb.freebsd.org/changeset/base/260833

Log:
  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

Modified:
  head/usr.bin/script/script.c

Modified: head/usr.bin/script/script.c
==============================================================================
--- head/usr.bin/script/script.c	Fri Jan 17 21:37:55 2014	(r260832)
+++ head/usr.bin/script/script.c	Fri Jan 17 21:45:25 2014	(r260833)
@@ -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;
 		}