commit 8d63ae128fd3e28cabc32528b92666e2c0b73e32
author Elliott Hughes <enh@google.com> Tue Oct 02 16:57:11 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 02 16:57:11 2018 +0000
tree eaff6ffe9847c60da40aa910c607824c017efb45
parent 928ce8eb645977d2fd3478e1e00789eaabb76d0a
parent 22917f63ee9ff25f629167b4a54f7d8be37da505

Merge "Make fclose/pclose distinct."

libc/stdio/stdio.cpp

diff --git a/libc/stdio/stdio.cpp b/libc/stdio/stdio.cpp
index 71fdd27..d7b69dc 100644
--- a/libc/stdio/stdio.cpp
+++ b/libc/stdio/stdio.cpp
@@ -404,8 +404,7 @@
 }
 __strong_alias(freopen64, freopen);
 
-int fclose(FILE* fp) {
-  CHECK_FP(fp);
+static int __FILE_close(FILE* fp) {
   if (fp->_flags == 0) {
     // Already freed!
     errno = EBADF;
@@ -440,7 +439,11 @@
   fp->_flags = 0;
   return r;
 }
-__strong_alias(pclose, fclose);
+
+int fclose(FILE* fp) {
+  CHECK_FP(fp);
+  return __FILE_close(fp);
+}
 
 int fileno_unlocked(FILE* fp) {
   CHECK_FP(fp);
@@ -459,6 +462,7 @@
 }
 
 void clearerr_unlocked(FILE* fp) {
+  CHECK_FP(fp);
   return __sclearerr(fp);
 }
 
@@ -1235,6 +1239,11 @@
   return fp;
 }
 
+int pclose(FILE* fp) {
+  CHECK_FP(fp);
+  return __FILE_close(fp);
+}
+
 namespace {
 
 namespace phony {