Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Jan 2014 21:50:02 GMT
From:      dfilter@FreeBSD.ORG (dfilter service)
To:        freebsd-bugs@FreeBSD.org
Subject:   Re: bin/161526: commit references a PR
Message-ID:  <201401172150.s0HLo2tB090434@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
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, 17 Jan 2014 21:45:32 +0000 (UTC)

 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;
  		}
 _______________________________________________
 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"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401172150.s0HLo2tB090434>