about summary refs log tree commit diff
path: root/nss/getXXent.c
diff options
context:
space:
mode:
Diffstat (limited to 'nss/getXXent.c')
-rw-r--r--nss/getXXent.c71
1 files changed, 52 insertions, 19 deletions
diff --git a/nss/getXXent.c b/nss/getXXent.c
index 7e291e6298..2d6d1c32e6 100644
--- a/nss/getXXent.c
+++ b/nss/getXXent.c
@@ -1,20 +1,24 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   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.
+   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.
 
-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.
+   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.
 
-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 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.  */
+
+#include <errno.h>
+#include <libc-lock.h>
+#include <stdlib.h>
 
 #include "nsswitch.h"
 
@@ -55,18 +59,47 @@ extern int INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer,
 					 size_t buflen, LOOKUP_TYPE **result
 					 H_ERRNO_PARM);
 
+/* We need to protect the dynamic buffer handling.  */
+__libc_lock_define_initialized (static, lock);
+
 
 LOOKUP_TYPE *
 GETFUNC_NAME (void)
 {
-  static char buffer[BUFLEN];
+  static char *buffer;
+  static size_t buffer_size;
   static LOOKUP_TYPE resbuf;
-  LOOKUP_TYPE *result;
+  LOOKUP_TYPE *result = NULL;
+  int save;
+
+  /* Get lock.  */
+  __libc_lock_lock (lock);
+
+  if (buffer == NULL)
+    {
+      buffer_size = BUFLEN;
+      buffer = malloc (buffer_size);
+    }
+
+  while (buffer != NULL
+	 && INTERNAL (REENTRANT_GETNAME) (&resbuf, buffer, buffer_size, &result
+					  H_ERRNO_VAR) != 0
+	 && errno == ERANGE)
+    {
+      char *new_buf;
+      buffer_size += BUFLEN;
+      new_buf = realloc (buffer, buffer_size);
+      if (new_buf == NULL)
+	/* We are out of memory.  Free the current buffer so that the
+	   process gets a chance for a normal termination.  */
+	free (buffer);
+      buffer = new_buf;
+    }
 
-  if (INTERNAL (REENTRANT_GETNAME) (&resbuf, buffer, BUFLEN, &result
-				    H_ERRNO_VAR) != 0)
-    /* Errors occured.  */
-    return NULL;
+  /* Release lock.  Preserve error value.  */
+  save = errno;
+  __libc_lock_unlock (lock);
+  __set_errno (save);
 
   return result;
 }