X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgroup-member.c;h=a34efc04afa2bdf4e6f8cca1338955e6e5f191d9;hb=cb9819cbb9261bd50c3466cf0a4cd873f0d7ebd7;hp=05b1bc0d783f81c04a38df944bfefeffc35d5556;hpb=2c5d56e26027133aaef449e8b7219fec2e543430;p=gnulib.git
diff --git a/lib/group-member.c b/lib/group-member.c
index 05b1bc0d7..a34efc04a 100644
--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -1,10 +1,12 @@
/* group-member.c -- determine whether group id is in calling user's group list
- Copyright (C) 1994 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,28 +14,20 @@
GNU General Public License for more details.
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., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ along with this program. If not, see . */
-#ifdef HAVE_CONFIG_H
#include
-#endif
+#include "group-member.h"
+
+#include
#include
#include
-
-#ifdef STDC_HEADERS
#include
-#endif
-#ifdef HAVE_UNISTD_H
#include
-#endif
-#include "group-member.h"
-
-char *xmalloc ();
-char *xrealloc ();
+#include "xalloc.h"
struct group_info
{
@@ -41,52 +35,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 +79,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 +113,7 @@ group_member (gid)
char *program_name;
int
-main (int argc, char** argv)
+main (int argc, char **argv)
{
int i;