X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetugroups.c;h=e102f21ca1e90e70065713a15d8d84a20015fe25;hb=3aa0d4da24ba7b52282b1d124b4118e4e8a46a2b;hp=0293d278506a3294b6ca327ec8b88118bd768aeb;hpb=c471cb38f3b7a9011f58d585dbdb0057e7bbd331;p=gnulib.git
diff --git a/lib/getugroups.c b/lib/getugroups.c
index 0293d2785..e102f21ca 100644
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -1,11 +1,11 @@
/* getugroups.c -- return a list of the groups a user is in
- Copyright (C) 1990, 1991, 1998-2000, 2003-2007 Free Software Foundation.
+ Copyright (C) 1990, 1991, 1998-2000, 2003-2008 Free Software Foundation.
- This program is free software; you can redistribute it and/or modify
+ 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
@@ -13,8 +13,7 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/* Written by David MacKenzie. */
@@ -22,15 +21,13 @@
#include "getugroups.h"
+#include
#include /* grp.h on alpha OSF1 V2.0 uses "FILE *". */
#include
#include
#include
-#ifndef EOVERFLOW
-# define EOVERFLOW EINVAL
-#endif
/* 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.
@@ -45,14 +42,13 @@ struct group *getgrent ();
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.
- Always return the number of groups of which USERNAME is a member. */
+ listed in /etc/groups. Upon failure, set errno and return -1.
+ Otherwise, return the number of IDs we've written into GROUPLIST. */
int
getugroups (int maxcount, GETGROUPS_T *grouplist, char const *username,
gid_t gid)
{
- struct group *grp;
int count = 0;
if (gid != (gid_t) -1)
@@ -63,9 +59,16 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char const *username,
}
setgrent ();
- while ((grp = getgrent ()) != 0)
+ while (1)
{
char **cp;
+ struct group *grp;
+
+ errno = 0;
+ grp = getgrent ();
+ if (grp == NULL)
+ break;
+
for (cp = grp->gr_mem; *cp; ++cp)
{
int n;
@@ -84,22 +87,28 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char const *username,
if (maxcount != 0)
{
if (count >= maxcount)
- {
- endgrent ();
- return count;
- }
+ goto done;
grouplist[count] = grp->gr_gid;
}
- count++;
- if (count < 0)
+ if (count == INT_MAX)
{
errno = EOVERFLOW;
- return -1;
+ goto done;
}
+ count++;
}
}
}
- endgrent ();
+
+ if (errno != 0)
+ count = -1;
+
+ done:
+ {
+ int saved_errno = errno;
+ endgrent ();
+ errno = saved_errno;
+ }
return count;
}