X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgroup-member.c;h=018702655e923db55ade234002dd21d64b9d1e97;hb=a98bbee4c1388c33841d11b4bdc5d0a600a9deda;hp=eda707321c9d6fcd3d2fb9aeb5359b52801e91b5;hpb=6d8337bfc808cddc275899c03482eceb6aff8547;p=gnulib.git

diff --git a/lib/group-member.c b/lib/group-member.c
index eda707321..018702655 100644
--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -1,5 +1,7 @@
 /* group-member.c -- determine whether group id is in calling user's group list
-   Copyright (C) 1994 Free Software Foundation, Inc.
+
+   Copyright (C) 1994, 1997, 1998, 2003, 2005, 2006 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,27 +15,20 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
+#include "group-member.h"
+
+#include <stdbool.h>
 #include <stdio.h>
 #include <sys/types.h>
-
-#ifdef STDC_HEADERS
 #include <stdlib.h>
-#endif
 
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 
-#include "group-member.h"
-
-char *xmalloc ();
-char *xrealloc ();
+#include "xalloc.h"
 
 struct group_info
   {
@@ -41,52 +36,41 @@ struct group_info
     GETGROUPS_T *group;
   };
 
-#ifdef HAVE_GETGROUPS
+#if HAVE_GETGROUPS
 
 static void
-free_group_info (g)
-     struct group_info *g;
+free_group_info (struct group_info const *g)
 {
   free (g->group);
-  free (g);
 }
 
-static struct group_info *
-get_group_info ()
+static bool
+get_group_info (struct group_info *gi)
 {
   int n_groups;
-  int n_group_slots;
-  struct group_info *gi;
+  int n_group_slots = getgroups (0, NULL);
   GETGROUPS_T *group;
 
-  /* getgroups () returns the number of elements that it was able to
-     place into the array.  We simply continue to call getgroups ()
-     until the number of elements placed into the array is smaller than
-     the physical size of the array. */
+  if (n_group_slots < 0)
+    return false;
 
-  group = NULL;
-  n_groups = 0;
-  n_group_slots = 0;
-  while (n_groups == n_group_slots)
-    {
-      n_group_slots += 64;
-      group = (GETGROUPS_T *) xrealloc (group,
-					n_group_slots * sizeof (GETGROUPS_T));
-      n_groups = getgroups (n_group_slots, group);
-    }
+  /* Avoid xnmalloc, as it goes awry when SIZE_MAX < n_group_slots.  */
+  if (xalloc_oversized (n_group_slots, sizeof *group))
+    xalloc_die ();
+  group = xmalloc (n_group_slots * sizeof *group);
+  n_groups = getgroups (n_group_slots, group);
 
   /* In case of error, the user loses. */
   if (n_groups < 0)
     {
       free (group);
-      return NULL;
+      return false;
     }
 
-  gi = (struct group_info *) xmalloc (sizeof (*gi));
   gi->n_groups = n_groups;
   gi->group = group;
 
-  return gi;
+  return true;
 }
 
 #endif /* not HAVE_GETGROUPS */
@@ -96,32 +80,30 @@ get_group_info ()
    either of the current or effective group IDs.  */
 
 int
-group_member (gid)
-     gid_t gid;
+group_member (gid_t gid)
 {
 #ifndef HAVE_GETGROUPS
   return ((gid == getgid ()) || (gid == getegid ()));
 #else
   int i;
   int found;
-  struct group_info *gi;
+  struct group_info gi;
 
-  gi = get_group_info ();
-  if (gi == NULL)
+  if (! get_group_info (&gi))
     return 0;
 
   /* Search through the list looking for GID. */
   found = 0;
-  for (i = 0; i < gi->n_groups; i++)
+  for (i = 0; i < gi.n_groups; i++)
     {
-      if (gid == gi->group[i])
+      if (gid == gi.group[i])
 	{
 	  found = 1;
 	  break;
 	}
     }
-  
-  free_group_info (gi);
+
+  free_group_info (&gi);
 
   return found;
 #endif /* HAVE_GETGROUPS */
@@ -132,7 +114,7 @@ group_member (gid)
 char *program_name;
 
 int
-main (int argc, char** argv)
+main (int argc, char **argv)
 {
   int i;