svn commit: r260925 - stable/9/usr.bin/script

[Mikolaj Golub]

Author: trociny
Date: Mon Jan 20 20:34:31 2014
New Revision: 260925
URL: http://svnweb.freebsd.org/changeset/base/260925

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/9/usr.bin/script/script.c
Directory Properties:
  stable/9/usr.bin/script/   (props changed)

Modified: stable/9/usr.bin/script/script.c
==============================================================================
--- stable/9/usr.bin/script/script.c	Mon Jan 20 20:33:40 2014	(r260924)
+++ stable/9/usr.bin/script/script.c	Mon Jan 20 20:34:31 2014	(r260925)
@@ -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;
 		}