X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetugroups.c;h=6c557cdf341fa55c5d9c2e338a4f3910a34b9552;hb=2f2f93bfb6e0991467a287c1f4a3e0c13b227ef1;hp=dbd86ef9390caf14fdd070e7b4bf62fbb8a0e2b5;hpb=a62be9f4039b4499cfbb76e394cad2259d03fa84;p=gnulib.git
diff --git a/lib/getugroups.c b/lib/getugroups.c
index dbd86ef93..6c557cdf3 100644
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -1,12 +1,11 @@
/* getugroups.c -- return a list of the groups a user is in
- Copyright (C) 1990, 1991, 1998, 1999, 2000, 2003, 2004 Free
- Software Foundation.
+ Copyright (C) 1990, 1991, 1998-2000, 2003-2007 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
@@ -14,30 +13,25 @@
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* Written by David MacKenzie. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
+
+#include "getugroups.h"
-#include
#include /* grp.h on alpha OSF1 V2.0 uses "FILE *". */
#include
-#ifdef HAVE_UNISTD_H
-# include
-#endif
+#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 ();
@@ -50,15 +44,14 @@ 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 *username, gid_t gid)
+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)
{
@@ -68,8 +61,16 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
}
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;
@@ -88,22 +89,28 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
if (maxcount != 0)
{
if (count >= maxcount)
- {
- endgrent ();
- return count;
- }
+ goto done;
grouplist[count] = grp->gr_gid;
}
count++;
if (count < 0)
{
errno = EOVERFLOW;
- return -1;
+ goto done;
}
}
}
}
- endgrent ();
+
+ if (errno != 0)
+ count = -1;
+
+ done:
+ {
+ int saved_errno = errno;
+ endgrent ();
+ errno = saved_errno;
+ }
return count;
}