X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/1f2f436a38f7ae2d39a943ad2898d8fed4ed2e58..refs/heads/master:/stdio/FreeBSD/freopen.c?ds=sidebyside

diff --git a/stdio/FreeBSD/freopen.c b/stdio/FreeBSD/freopen.c
index 524ae6d..b401304 100644
--- a/stdio/FreeBSD/freopen.c
+++ b/stdio/FreeBSD/freopen.c
@@ -70,11 +70,10 @@ freopen(file, mode, fp)
 		return (NULL);
 	}
 
+	pthread_once(&__sdidinit, __sinit);
+	
 	FLOCKFILE(fp);
 
-	if (!__sdidinit)
-		__sinit();
-
 	/*
 	 * If the filename is a NULL pointer, the caller is asking us to
 	 * re-open the same file with a different mode. We allow this only
@@ -98,7 +97,7 @@ freopen(file, mode, fp)
 		    (oflags & O_ACCMODE)) {
 			fclose(fp);
 			FUNLOCKFILE(fp);
-			errno = EINVAL;
+			errno = EBADF;
 			return (NULL);
 		}
 		if (fp->_flags & __SWR)
@@ -131,6 +130,8 @@ freopen(file, mode, fp)
 	 * descriptor (if any) was associated with it.  If it was attached to
 	 * a descriptor, defer closing it; freopen("/dev/stdin", "r", stdin)
 	 * should work.  This is unnecessary if it was not a Unix file.
+	 *
+	 * For UNIX03, we always close if it was open.
 	 */
 	if (fp->_flags == 0) {
 		fp->_flags = __SEOF;	/* hold on to it */
@@ -141,11 +142,18 @@ freopen(file, mode, fp)
 		if (fp->_flags & __SWR)
 			(void) __sflush(fp);
 		/* if close is NULL, closing is a no-op, hence pointless */
+#if __DARWIN_UNIX03
+		if (fp->_close)
+			(void) (*fp->_close)(fp->_cookie);
+		isopen = 0;
+		wantfd = -1;
+#else /* !__DARWIN_UNIX03 */
 		isopen = fp->_close != NULL;
 		if ((wantfd = fp->_file) < 0 && isopen) {
 			(void) (*fp->_close)(fp->_cookie);
 			isopen = 0;
 		}
+#endif /* __DARWIN_UNIX03 */
 	}
 
 	/* Get a new descriptor to refer to the new file. */
@@ -186,8 +194,8 @@ finish:
 	memset(&fp->_mbstate, 0, sizeof(mbstate_t));
 
 	if (f < 0) {			/* did not get it after all */
-		fp->_flags = 0;		/* set it free */
 		FUNLOCKFILE(fp);
+		__sfprelease(fp);	/* set it free */
 		errno = sverrno;	/* restore in case _close clobbered */
 		return (NULL);
 	}
@@ -212,8 +220,8 @@ finish:
 	 * open.
 	 */
 	if (f > SHRT_MAX) {
-		fp->_flags = 0;		/* set it free */
 		FUNLOCKFILE(fp);
+		__sfprelease(fp);	/* set it free */
 		errno = EMFILE;
 		return (NULL);
 	}