Optimize a bit by using mempcpy.

[kopensolaris-gnu/glibc.git] / nss / getXXent.c

diff --git a/nss/getXXent.c b/nss/getXXent.c
index fd75979..491ab4d 100644 (file)
--- 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.
+/* Copyright (C) 1996, 1997 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.
+   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 <bits/libc-lock.h>
+#include <stdlib.h>
 
 #include "nsswitch.h"
 
@@ -38,6 +42,8 @@ Boston, MA 02111-1307, USA.  */
 #define REENTRANT_GETNAME APPEND_R (GETFUNC_NAME)
 #define APPEND_R(name) APPEND_R1 (name)
 #define APPEND_R1(name) name##_r
+#define INTERNAL(name) INTERNAL1 (name)
+#define INTERNAL1(name) __##name
 
 /* Sometimes we need to store error codes in the `h_errno' variable.  */
 #ifdef NEED_H_ERRNO
@@ -49,15 +55,61 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 /* Prototype of the reentrant version.  */
-LOOKUP_TYPE *REENTRANT_GETNAME (LOOKUP_TYPE *result, char *buffer,
-                               int buflen H_ERRNO_PARM);
+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 LOOKUP_TYPE result;
+  static char *buffer;
+  static size_t buffer_size;
+  static LOOKUP_TYPE resbuf;
+  LOOKUP_TYPE *result;
+  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
+#ifdef NEED_H_ERRNO
+        && h_errno == NETDB_INTERNAL
+#endif
+        && 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.  */
+         save = errno;
+         free (buffer);
+         __set_errno (save);
+       }
+      buffer = new_buf;
+    }
+
+  if (buffer == NULL)
+    result = NULL;
+
+  /* Release lock.  Preserve error value.  */
+  save = errno;
+  __libc_lock_unlock (lock);
+  __set_errno (save);
 
-  return REENTRANT_GETNAME (&result, buffer, BUFLEN H_ERRNO_VAR);
+  return result;
 }