From owner-svn-src-stable@FreeBSD.ORG  Wed Jun 13 03:29:57 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E40F6106566B;
	Wed, 13 Jun 2012 03:29:57 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CF58D8FC12;
	Wed, 13 Jun 2012 03:29:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5D3TvUp092620;
	Wed, 13 Jun 2012 03:29:57 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5D3Tv8O092618;
	Wed, 13 Jun 2012 03:29:57 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201206130329.q5D3Tv8O092618@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 13 Jun 2012 03:29:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236981 - stable/7/lib/libc/stdio
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jun 2012 03:29:58 -0000

Author: eadler
Date: Wed Jun 13 03:29:57 2012
New Revision: 236981
URL: http://svn.freebsd.org/changeset/base/236981

Log:
  MFC r236288:
  	Only set _w to 0 when the file stream is not currently reading. Without this fflush may fail to write data in the buffer.
  
  PR:		kern/137819
  Approved by:	cperciva (implicit)

Modified:
  stable/7/lib/libc/stdio/fpurge.c
Directory Properties:
  stable/7/lib/libc/   (props changed)

Modified: stable/7/lib/libc/stdio/fpurge.c
==============================================================================
--- stable/7/lib/libc/stdio/fpurge.c	Wed Jun 13 03:19:11 2012	(r236980)
+++ stable/7/lib/libc/stdio/fpurge.c	Wed Jun 13 03:29:57 2012	(r236981)
@@ -62,7 +62,7 @@ fpurge(fp)
 			FREEUB(fp);
 		fp->_p = fp->_bf._base;
 		fp->_r = 0;
-		fp->_w = fp->_flags & (__SLBF|__SNBF) ? 0 : fp->_bf._size;
+		fp->_w = fp->_flags & (__SLBF|__SNBF|__SRD) ? 0 : fp->_bf._size;
 		retval = 0;
 	}
 	FUNLOCKFILE(fp);