From owner-svn-src-all@FreeBSD.ORG  Tue Jul 22 20:13:47 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 408B518E;
 Tue, 22 Jul 2014 20:13:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 2C278211D;
 Tue, 22 Jul 2014 20:13:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6MKDkdO079202;
 Tue, 22 Jul 2014 20:13:46 GMT (envelope-from ache@svn.freebsd.org)
Received: (from ache@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6MKDk68079201;
 Tue, 22 Jul 2014 20:13:46 GMT (envelope-from ache@svn.freebsd.org)
Message-Id: <201407222013.s6MKDk68079201@svn.freebsd.org>
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Tue, 22 Jul 2014 20:13:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268992 - 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-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jul 2014 20:13:47 -0000

Author: ache
Date: Tue Jul 22 20:13:46 2014
New Revision: 268992
URL: http://svnweb.freebsd.org/changeset/base/268992

Log:
  Back the whole change out until I figure out how to obtain O_APPEND,
  it can't be used in this field at all.

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

Modified: head/lib/libc/stdio/ftell.c
==============================================================================
--- head/lib/libc/stdio/ftell.c	Tue Jul 22 19:55:25 2014	(r268991)
+++ head/lib/libc/stdio/ftell.c	Tue Jul 22 20:13:46 2014	(r268992)
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 #include "namespace.h"
 #include <sys/types.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>
 #include "un-namespace.h"
@@ -119,11 +118,6 @@ _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|O_APPEND)) {
-			pos = _sseek(fp, (fpos_t)0, SEEK_END);
-			if (pos == -1)
-				return (1);
-		}
 		/*
 		 * Writing.  Any buffered characters cause the
 		 * position to be greater than that in the