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

[thirdparty/glibc.git] / misc / mntent.c

diff --git a/misc/mntent.c b/misc/mntent.c
index 95f745ec787af7f6a97d5e34cedc4dae1d4932e8..326c9cd6419750ba34ee8dde5e20930d61f4e661 100644 (file)
--- a/misc/mntent.c
+++ b/misc/mntent.c
@@ -1,29 +1,58 @@
 /* Utilities for reading/writing fstab, mtab, etc.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995-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 Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   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/>.  */
 
 #include <mntent.h>
+#include <stdlib.h>
+#include <allocate_once.h>
+
+struct mntent_buffer
+{
+  struct mntent m;
+  char buffer[4096];
+};
+
+/* We don't want to allocate the static buffer all the time since it
+   is not always used (in fact, rather infrequently).  */
+libc_freeres_ptr (static void *mntent_buffer);
+
+static void *
+allocate (void *closure)
+{
+  return malloc (sizeof (struct mntent_buffer));
+}
+
+static void
+deallocate (void *closure, void *ptr)
+{
+  free (ptr);
+}
 
 struct mntent *
 getmntent (FILE *stream)
 {
-  static char buf[8192];
-  static struct mntent m;
+  struct mntent_buffer *buffer = allocate_once (&mntent_buffer,
+                                               allocate, deallocate, NULL);
+  if (buffer == NULL)
+    /* If no core is available we don't have a chance to run the
+       program successfully and so returning NULL is an acceptable
+       result.  */
+    return NULL;
 
-  return __getmntent_r (stream, &m, buf, sizeof buf);
+  return __getmntent_r (stream, &buffer->m,
+                       buffer->buffer, sizeof (buffer->buffer));
 }