Prefer https to http for gnu.org and fsf.org URLs

[thirdparty/glibc.git] / libio / iofclose.c

diff --git a/libio/iofclose.c b/libio/iofclose.c
index c797d86fd8b455950384f57323e465b484945250..398b86d597d6201c4120c0e09bb07c4f523ba6ed 100644 (file)
--- a/libio/iofclose.c
+++ b/libio/iofclose.c
@@ -1,51 +1,80 @@
-/*
-Copyright (C) 1993, 1995 Free Software Foundation
-
-This file is part of the GNU IO Library.  This library is free
-software; you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this library; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-As a special exception, if you link this library with files
-compiled with a GNU compiler to produce an executable, this does not cause
-the resulting executable to be covered by the GNU General Public License.
-This exception does not however invalidate any other reasons why
-the executable file might be covered by the GNU General Public License. */
+/* Copyright (C) 1993-2019 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.
+
+   As a special exception, if you link the code in this file with
+   files compiled with a GNU compiler to produce an executable,
+   that does not cause the resulting executable to be covered by
+   the GNU Lesser General Public License.  This exception does not
+   however invalidate any other reasons why the executable file
+   might be covered by the GNU Lesser General Public License.
+   This exception applies to code released by its copyright holders
+   in files containing the exception.  */
 
 #include "libioP.h"
-#ifdef __STDC__
 #include <stdlib.h>
-#endif
+#include "../iconv/gconv_int.h"
+#include <shlib-compat.h>
 
 int
-_IO_fclose (fp)
-     register _IO_FILE *fp;
+_IO_new_fclose (FILE *fp)
 {
   int status;
 
   CHECK_FILE(fp, EOF);
 
-  if (fp->_IO_file_flags & _IO_IS_FILEBUF)
+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
+  /* We desperately try to help programs which are using streams in a
+     strange way and mix old and new functions.  Detect old streams
+     here.  */
+  if (_IO_vtable_offset (fp) != 0)
+    return _IO_old_fclose (fp);
+#endif
+
+  /* First unlink the stream.  */
+  if (fp->_flags & _IO_IS_FILEBUF)
+    _IO_un_link ((struct _IO_FILE_plus *) fp);
+
+  _IO_acquire_lock (fp);
+  if (fp->_flags & _IO_IS_FILEBUF)
     status = _IO_file_close_it (fp);
   else
     status = fp->_flags & _IO_ERR_SEEN ? -1 : 0;
+  _IO_release_lock (fp);
   _IO_FINISH (fp);
-  if (fp != _IO_stdin && fp != _IO_stdout && fp != _IO_stderr)
+  if (fp->_mode > 0)
+    {
+      /* This stream has a wide orientation.  This means we have to free
+        the conversion functions.  */
+      struct _IO_codecvt *cc = fp->_codecvt;
+
+      __libc_lock_lock (__gconv_lock);
+      __gconv_release_step (cc->__cd_in.__cd.__steps);
+      __gconv_release_step (cc->__cd_out.__cd.__steps);
+      __libc_lock_unlock (__gconv_lock);
+    }
+  else
     {
-      fp->_IO_file_flags = 0;
-      free(fp);
+      if (_IO_have_backup (fp))
+       _IO_free_backup_area (fp);
     }
+  _IO_deallocate_file (fp);
   return status;
 }
 
-weak_alias (_IO_fclose, fclose)
+versioned_symbol (libc, _IO_new_fclose, _IO_fclose, GLIBC_2_1);
+strong_alias (_IO_new_fclose, __new_fclose)
+versioned_symbol (libc, __new_fclose, fclose, GLIBC_2_1);