X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetugroups.c;h=6c557cdf341fa55c5d9c2e338a4f3910a34b9552;hb=6cad9c91215eac0f90bbb1f9473ea0f5fce3b085;hp=98e752609bfb93a4a7d5d6f36acd983e9bbdbd41;hpb=7ab769f3a7d85d18d17d4e779430fa56b6e17a18;p=gnulib.git
diff --git a/lib/getugroups.c b/lib/getugroups.c
index 98e752609..6c557cdf3 100644
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -1,10 +1,11 @@
/* getugroups.c -- return a list of the groups a user is in
- Copyright (C) 1990, 1991 Free Software Foundation.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1990, 1991, 1998-2000, 2003-2007 Free Software Foundation.
+
+ 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,64 +13,104 @@
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 . */
/* Written by David MacKenzie. */
-#ifdef HAVE_CONFIG_H
#include
-#endif
-#include
+#include "getugroups.h"
+
#include /* grp.h on alpha OSF1 V2.0 uses "FILE *". */
#include
-#ifdef HAVE_UNISTD_H
#include
+
+#include
+#ifndef EOVERFLOW
+# define EOVERFLOW EINVAL
#endif
-/* setgrent, getgrent, and endgrent are not specified by POSIX.1,
- so header files might not declare them.
+/* Some old header files might not declare setgrent, getgrent, and endgrent.
If you don't have them at all, we can't implement this function.
You lose! */
struct group *getgrent ();
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
#include
-#else
-#include
-#endif
-/* Like `getgroups', but for user USERNAME instead of for
- the current process. */
+#define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
+
+/* Like `getgroups', but for user USERNAME instead of for the current
+ process. Store at most MAXCOUNT group IDs in the GROUPLIST array.
+ If GID is not -1, store it first (if possible). GID should be the
+ group ID (pw_gid) obtained from getpwuid, in case USERNAME is not
+ listed in /etc/groups. Upon failure, set errno and return -1.
+ Otherwise, return the number of IDs we've written into GROUPLIST. */
int
-getugroups (maxcount, grouplist, username)
- int maxcount;
- GETGROUPS_T *grouplist;
- char *username;
+getugroups (int maxcount, GETGROUPS_T *grouplist, char const *username,
+ gid_t gid)
{
- struct group *grp;
- register char **cp;
- register int count = 0;
+ int count = 0;
+
+ if (gid != (gid_t) -1)
+ {
+ if (maxcount != 0)
+ grouplist[count] = gid;
+ ++count;
+ }
setgrent ();
- while ((grp = getgrent ()) != 0)
- for (cp = grp->gr_mem; *cp; ++cp)
- if (!strcmp (username, *cp))
+ while (1)
+ {
+ char **cp;
+ struct group *grp;
+
+ errno = 0;
+ grp = getgrent ();
+ if (grp == NULL)
+ break;
+
+ for (cp = grp->gr_mem; *cp; ++cp)
{
- if (maxcount != 0)
+ int n;
+
+ if ( ! STREQ (username, *cp))
+ continue;
+
+ /* See if this group number is already on the list. */
+ for (n = 0; n < count; ++n)
+ if (grouplist && grouplist[n] == grp->gr_gid)
+ break;
+
+ /* If it's a new group number, then try to add it to the list. */
+ if (n == count)
{
- if (count >= maxcount)
+ if (maxcount != 0)
+ {
+ if (count >= maxcount)
+ goto done;
+ grouplist[count] = grp->gr_gid;
+ }
+ count++;
+ if (count < 0)
{
- endgrent ();
- return count;
+ errno = EOVERFLOW;
+ goto done;
}
- grouplist[count] = grp->gr_gid;
}
- count++;
}
- endgrent ();
+ }
+
+ if (errno != 0)
+ count = -1;
+
+ done:
+ {
+ int saved_errno = errno;
+ endgrent ();
+ errno = saved_errno;
+ }
+
return count;
}