From owner-svn-src-head@freebsd.org  Wed Mar 30 06:13:59 2016
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 68AD3AE27D8;
 Wed, 30 Mar 2016 06:13:59 +0000 (UTC) (envelope-from pfg@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 395F4196A;
 Wed, 30 Mar 2016 06:13:59 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2U6DwnX026747;
 Wed, 30 Mar 2016 06:13:58 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2U6DwGv026746;
 Wed, 30 Mar 2016 06:13:58 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201603300613.u2U6DwGv026746@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Wed, 30 Mar 2016 06:13:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r297408 - 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.21
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: Wed, 30 Mar 2016 06:13:59 -0000

Author: pfg
Date: Wed Mar 30 06:13:58 2016
New Revision: 297408
URL: https://svnweb.freebsd.org/changeset/base/297408

Log:
  freopen(3): prevent uninitialized errno.
  
  Revert r297407 and redo it cleanly.
  
  Pointed out by:	Jukka A. Ukkonen
  CID:		1018720
  MFC after:	1 week

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

Modified: head/lib/libc/stdio/freopen.c
==============================================================================
--- head/lib/libc/stdio/freopen.c	Wed Mar 30 01:32:08 2016	(r297407)
+++ head/lib/libc/stdio/freopen.c	Wed Mar 30 06:13:58 2016	(r297408)
@@ -66,8 +66,7 @@ freopen(const char * __restrict file, co
 		(void) fclose(fp);
 		errno = sverrno;
 		return (NULL);
-	} else
-		sverrno = 0;
+	}
 
 	FLOCKFILE(fp);
 
@@ -79,6 +78,7 @@ freopen(const char * __restrict file, co
 	 * re-open the same file with a different mode. We allow this only
 	 * if the modes are compatible.
 	 */
+	sverrno = 0;
 	if (file == NULL) {
 		/* See comment below regarding freopen() of closed files. */
 		if (fp->_flags == 0) {