Update copyright notices with scripts/update-copyrights

[thirdparty/glibc.git] / nis / nss_nis / nis-netgrp.c

diff --git a/nis/nss_nis/nis-netgrp.c b/nis/nss_nis/nis-netgrp.c
index aa51c2f0df5656abcecc13e37c51152beeb13073..d4b2e569d3e46336aec0cc7984dd64acb81eb8de 100644 (file)
--- a/nis/nss_nis/nis-netgrp.c
+++ b/nis/nss_nis/nis-netgrp.c
@@ -1,27 +1,27 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996.
+   Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
 
    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
+   <http://www.gnu.org/licenses/>.  */
 
-#include <nss.h>
+#include <assert.h>
 #include <ctype.h>
 #include <errno.h>
-#include <libc-lock.h>
+#include <malloc.h>
 #include <netdb.h>
+#include <nss.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,98 +31,69 @@
 
 #include "nss-nis.h"
 
-/* Locks the static variables in this file.  */
-__libc_lock_define_initialized (static, lock)
+extern enum nss_status
+_nss_netgroup_parseline (char **cursor, struct __netgrent *netgrp,
+                        char *buffer, size_t buflen, int *errnop);
 
-static char *data = NULL;
-static size_t data_size = 0;
-static char *cursor = NULL;;
 
-extern enum nss_status
-_nss_netgroup_parseline (char **cursor, struct __netgrent *result,
-                        char *buffer, size_t buflen);
+static void
+internal_nis_endnetgrent (struct __netgrent *netgrp)
+{
+  free (netgrp->data);
+  netgrp->data = NULL;
+  netgrp->data_size = 0;
+  netgrp->cursor = NULL;
+}
+
 
 enum nss_status
-_nss_nis_setnetgrent (char *group)
+_nss_nis_setnetgrent (const char *group, struct __netgrent *netgrp)
 {
-  char *domain;
-  char *result;
-  int len, group_len;
+  int len;
   enum nss_status status;
 
   status = NSS_STATUS_SUCCESS;
 
-  if (group == NULL || group[0] == '\0')
+  if (__builtin_expect (group == NULL || group[0] == '\0', 0))
     return NSS_STATUS_UNAVAIL;
 
-  if (yp_get_default_domain (&domain))
+  char *domain;
+  if (__builtin_expect (yp_get_default_domain (&domain), 0))
     return NSS_STATUS_UNAVAIL;
 
-  __libc_lock_lock (lock);
-
-  if (data != NULL)
-    {
-      free (data);
-      data = NULL;
-      data_size = 0;
-      cursor = NULL;
-    }
-
-  group_len = strlen (group);
-
-  status = yperr2nss (yp_match (domain, "netgroup", group, group_len,
-                               &result, &len));
-  if (status == NSS_STATUS_SUCCESS)
+  status = yperr2nss (yp_match (domain, "netgroup", group, strlen (group),
+                               &netgrp->data, &len));
+  if (__builtin_expect (status == NSS_STATUS_SUCCESS, 1))
     {
-      if (len > 0)
-       {
-         data = malloc (len + 1);
-         data_size = len;
-         cursor = strncpy (data, result, len + 1);
-         data[len] = '\0';
-         free (result);
-       }
-      else
-       status = NSS_STATUS_NOTFOUND;
+      /* Our implementation of yp_match already allocates a buffer
+        which is one byte larger than the value in LEN specifies
+        and the last byte is filled with NUL.  So we can simply
+        use that buffer.  */
+      assert (len >= 0);
+      assert (malloc_usable_size (netgrp->data) >= len + 1);
+      assert (netgrp->data[len] == '\0');
+
+      netgrp->data_size = len;
+      netgrp->cursor = netgrp->data;
     }
 
-  __libc_lock_unlock (lock);
-
   return status;
 }
 
 
 enum nss_status
-_nss_nis_endnetgrent (void)
+_nss_nis_endnetgrent (struct __netgrent *netgrp)
 {
-  __libc_lock_lock (lock);
-
-  if (data != NULL)
-    {
-      free (data);
-      data = NULL;
-      data_size = 0;
-      cursor = NULL;
-    }
-
-  __libc_lock_unlock (lock);
+  internal_nis_endnetgrent (netgrp);
 
   return NSS_STATUS_SUCCESS;
 }
 
+
 enum nss_status
-_nss_nis_getnetgrent_r (struct __netgrent *result, char *buffer, size_t buflen)
+_nss_nis_getnetgrent_r (struct __netgrent *result, char *buffer, size_t buflen,
+                       int *errnop)
 {
-  enum nss_status status;
-
-  if (cursor == NULL)
-    return NSS_STATUS_NOTFOUND;
-
-  __libc_lock_lock (lock);
-
-  status = _nss_netgroup_parseline (&cursor, result, buffer, buflen);
-
-  __libc_lock_unlock (lock);
-
-  return status;
+  return _nss_netgroup_parseline (&result->cursor, result, buffer, buflen,
+                                 errnop);
 }