Loading...
--- Libc/Libc-1725.40.4/stdio/FreeBSD/fclose.c
+++ Libc/Libc-825.26/stdio/FreeBSD/fclose.c
@@ -43,17 +43,14 @@
#include "un-namespace.h"
#include "libc_private.h"
#include "local.h"
-#include "libc_hooks_impl.h"
int
fclose(FILE *fp)
{
int r;
- int error = 0;
- libc_hooks_will_write(fp, sizeof(*fp));
-
- pthread_once(&__sdidinit, __sinit);
+ if (!__sdidinit)
+ __sinit();
if (fp == NULL) {
errno = EFAULT;
@@ -64,14 +61,9 @@
return (EOF);
}
FLOCKFILE(fp);
- r = __sflush(fp);
- if (r < 0) {
- error = errno;
- }
- if (fp->_close != NULL && (*fp->_close)(fp->_cookie) < 0) {
+ r = fp->_flags & __SWR ? __sflush(fp) : 0;
+ if (fp->_close != NULL && (*fp->_close)(fp->_cookie) < 0)
r = EOF;
- error = errno;
- }
if (fp->_flags & __SMBF)
free((char *)fp->_bf._base);
if (HASUB(fp))
@@ -80,11 +72,7 @@
FREELB(fp);
fp->_file = -1;
fp->_r = fp->_w = 0; /* Mess up if reaccessed. */
+ __sfprelease(fp); /* Release this FILE for reuse. */
FUNLOCKFILE(fp);
- __sfprelease(fp); /* Release this FILE for reuse. */
- /* Don't clobber errno unnecessarily. */
- if (error) {
- errno = error;
- }
return (r);
}