--- Libc/Libc-763.13/stdio/FreeBSD/fclose.c
+++ Libc/Libc-1583.60.2/stdio/FreeBSD/fclose.c
@@ -48,15 +48,27 @@
 fclose(FILE *fp)
 {
 	int r;
+	int error = 0;
 
+	pthread_once(&__sdidinit, __sinit);
+
+	if (fp == NULL) {
+		errno = EFAULT;
+		return (EOF);
+	}
 	if (fp->_flags == 0) {	/* not open! */
 		errno = EBADF;
 		return (EOF);
 	}
 	FLOCKFILE(fp);
-	r = fp->_flags & __SWR ? __sflush(fp) : 0;
-	if (fp->_close != NULL && (*fp->_close)(fp->_cookie) < 0)
+	r = __sflush(fp);
+	if (r < 0) {
+		error = errno;
+	}
+	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))
@@ -65,7 +77,11 @@
 		FREELB(fp);
 	fp->_file = -1;
 	fp->_r = fp->_w = 0;	/* Mess up if reaccessed. */
-	fp->_flags = 0;		/* 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);
 }