From owner-freebsd-bugs@FreeBSD.ORG  Fri Oct 21 05:40:13 2011
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 49271106564A
	for <freebsd-bugs@hub.freebsd.org>;
	Fri, 21 Oct 2011 05:40:13 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 1F7B08FC08
	for <freebsd-bugs@hub.freebsd.org>;
	Fri, 21 Oct 2011 05:40:13 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p9L5eDtI088391
	for <freebsd-bugs@freefall.freebsd.org>; Fri, 21 Oct 2011 05:40:13 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p9L5eC1Y088390;
	Fri, 21 Oct 2011 05:40:12 GMT (envelope-from gnats)
Date: Fri, 21 Oct 2011 05:40:12 GMT
Message-Id: <201110210540.p9L5eC1Y088390@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: bin/161526: commit references a PR
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Oct 2011 05:40:13 -0000

The following reply was made to PR bin/161526; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/161526: commit references a PR
Date: Fri, 21 Oct 2011 05:37:52 +0000 (UTC)

 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@stade.co.uk>, Stefan Bethke <stb@lassitu.de>
   Tested by:	Stefan Bethke <stb@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;
  		}
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"