From owner-freebsd-bugs@FreeBSD.ORG  Mon Jan 20 20:40:02 2014
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6A11048F
 for <freebsd-bugs@smarthost.ysv.freebsd.org>;
 Mon, 20 Jan 2014 20:40:02 +0000 (UTC)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 56BA11876
 for <freebsd-bugs@smarthost.ysv.freebsd.org>;
 Mon, 20 Jan 2014 20:40:02 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s0KKe2si033195
 for <freebsd-bugs@freefall.freebsd.org>; Mon, 20 Jan 2014 20:40:02 GMT
 (envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
 by freefall.freebsd.org (8.14.7/8.14.7/Submit) id s0KKe2I7033194;
 Mon, 20 Jan 2014 20:40:02 GMT (envelope-from gnats)
Date: Mon, 20 Jan 2014 20:40:02 GMT
Message-Id: <201401202040.s0KKe2I7033194@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
Cc: 
From: dfilter@FreeBSD.ORG (dfilter service)
Subject: Re: bin/161526: commit references a PR
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Mon, 20 Jan 2014 20:40:02 -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: 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;
  		}
 _______________________________________________
 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"