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

[Mikolaj Golub]

Author: trociny
Date: Fri Oct 21 05:37:40 2011
New Revision: 226591
URL: http://svn.freebsd.org/changeset/base/226591

Log:
  MFC r226403:
  
  In r225809 the intention was to send VEOF only once if STDIN was not a
  terminal. Unfortunately the fix was incorrect and for flushtime > 0 it
  keept sending VEOF.
  
  Sent VEOF generates ^D\b\b echoed by the terminal, which was reported
  in bin/161526. Note, we still send VEOF at least once. Otherwise
  commands like below would hang forever:
  
    echo 1 |script /tmp/script.out cat
  
  PR:		bin/161526
  Reported by:	Adrian Wontroba <aw1 at stade.co.uk>, Stefan Bethke <stb at lassitu.de>
  Tested by:	Stefan Bethke <stb at lassitu.de>
  Approved by:	re (kib)

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	Thu Oct 20 22:38:24 2011	(r226590)
+++ stable/9/usr.bin/script/script.c	Fri Oct 21 05:37:40 2011	(r226591)
@@ -163,12 +163,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;
 		}