From owner-svn-src-head@FreeBSD.ORG  Sat Jul 26 08:41:04 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 05810DC;
 Sat, 26 Jul 2014 08:41:04 +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 E6FDA254B;
 Sat, 26 Jul 2014 08:41:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6Q8f3Cg091466;
 Sat, 26 Jul 2014 08:41:03 GMT (envelope-from ache@svn.freebsd.org)
Received: (from ache@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6Q8f3Od091465;
 Sat, 26 Jul 2014 08:41:03 GMT (envelope-from ache@svn.freebsd.org)
Message-Id: <201407260841.s6Q8f3Od091465@svn.freebsd.org>
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Sat, 26 Jul 2014 08:41:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269116 - 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.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Jul 2014 08:41:04 -0000

Author: ache
Date: Sat Jul 26 08:41:03 2014
New Revision: 269116
URL: http://svnweb.freebsd.org/changeset/base/269116

Log:
  In the "Too many open files" edge cases don't try to preserve old
  number for non-std* descriptors, but close old file and retry.
  
  Obtained from:  inspired by Apple's change from pfg@
  MFC after:      2 weeks

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

Modified: head/lib/libc/stdio/freopen.c
==============================================================================
--- head/lib/libc/stdio/freopen.c	Sat Jul 26 07:40:31 2014	(r269115)
+++ head/lib/libc/stdio/freopen.c	Sat Jul 26 08:41:03 2014	(r269116)
@@ -151,6 +151,14 @@ freopen(const char * __restrict file, co
 
 	/* Get a new descriptor to refer to the new file. */
 	f = _open(file, oflags, DEFFILEMODE);
+	/* If out of fd's close the old one and try again. */
+	if (f < 0 && isopen && wantfd > STDERR_FILENO &&
+	    (errno == ENFILE || errno == EMFILE)) {
+		(void) (*fp->_close)(fp->_cookie);
+		isopen = 0;
+		wantfd = -1;
+		f = _open(file, oflags, DEFFILEMODE);
+	}
 	sverrno = errno;
 
 finish: