From da0a5df9dc8554eee90ceed7c5c9f42c593adc85 Mon Sep 17 00:00:00 2001 From: ache Date: Wed, 6 Aug 2014 10:38:06 +0000 Subject: MFC: r269116 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@ --- lib/libc/stdio/freopen.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/libc/stdio/freopen.c b/lib/libc/stdio/freopen.c index b3a07d9..bf3f030 100644 --- a/lib/libc/stdio/freopen.c +++ b/lib/libc/stdio/freopen.c @@ -150,6 +150,14 @@ freopen(const char * __restrict file, const char * __restrict mode, /* 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: -- cgit v1.1