From owner-svn-src-head@freebsd.org  Sun Nov  1 06:15:15 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D747EA2328F;
 Sun,  1 Nov 2015 06:15:15 +0000 (UTC)
 (envelope-from ache@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A1B7A127F;
 Sun,  1 Nov 2015 06:15:15 +0000 (UTC)
 (envelope-from ache@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA16FEM2071018;
 Sun, 1 Nov 2015 06:15:14 GMT (envelope-from ache@FreeBSD.org)
Received: (from ache@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA16FELV071017;
 Sun, 1 Nov 2015 06:15:14 GMT (envelope-from ache@FreeBSD.org)
Message-Id: <201511010615.tA16FELV071017@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ache set sender to
 ache@FreeBSD.org using -f
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Sun, 1 Nov 2015 06:15:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290230 - head/lib/libc/stdio
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Nov 2015 06:15:15 -0000

Author: ache
Date: Sun Nov  1 06:15:14 2015
New Revision: 290230
URL: https://svnweb.freebsd.org/changeset/base/290230

Log:
  Don't seek to the end if write buffer is empty (in append modes).
  
  PR:             204156
  MFC after:      1 week

Modified:
  head/lib/libc/stdio/ftell.c

Modified: head/lib/libc/stdio/ftell.c
==============================================================================
--- head/lib/libc/stdio/ftell.c	Sat Oct 31 20:38:06 2015	(r290229)
+++ head/lib/libc/stdio/ftell.c	Sun Nov  1 06:15:14 2015	(r290230)
@@ -119,7 +119,18 @@ _ftello(FILE *fp, fpos_t *offset)
 		if (HASUB(fp))
 			pos -= fp->_r;  /* Can be negative at this point. */
 	} else if ((fp->_flags & __SWR) && fp->_p != NULL) {
-		if ((fp->_flags & __SAPP) || (fp->_flags2 & __S2OAP)) {
+		/*
+		 * Writing.  Any buffered characters cause the
+		 * position to be greater than that in the
+		 * underlying object.
+		 */
+		n = fp->_p - fp->_bf._base;
+		if (pos > OFF_MAX - n) {
+			errno = EOVERFLOW;
+			return (1);
+		}
+		if (n > 0 &&
+		    ((fp->_flags & __SAPP) || (fp->_flags2 & __S2OAP))) {
 			int serrno = errno;
 
 			errno = 0;
@@ -137,16 +148,6 @@ _ftello(FILE *fp, fpos_t *offset)
 			}
 			errno = serrno;
 		}
-		/*
-		 * Writing.  Any buffered characters cause the
-		 * position to be greater than that in the
-		 * underlying object.
-		 */
-		n = fp->_p - fp->_bf._base;
-		if (pos > OFF_MAX - n) {
-			errno = EOVERFLOW;
-			return (1);
-		}
 		pos += n;
 	}
 	*offset = pos;