--- freopen.c.orig 2009-02-15 03:11:22.000000000 -0800 +++ freopen.c 2009-02-15 14:26:16.000000000 -0800 @@ -99,7 +99,7 @@ freopen(file, mode, fp) (oflags & O_ACCMODE)) { fclose(fp); FUNLOCKFILE(fp); - errno = EINVAL; + errno = EBADF; return (NULL); } if ((oflags ^ dflags) & O_APPEND) { @@ -136,6 +136,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 */ @@ -146,11 +148,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. */ @@ -191,7 +200,7 @@ finish: memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t)); if (f < 0) { /* did not get it after all */ - fp->_flags = 0; /* set it free */ + __sfprelease(fp); /* set it free */ errno = sverrno; /* restore in case _close clobbered */ FUNLOCKFILE(fp); return (NULL);