upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-09-01 02:34:55 +00:00
Code Activity

* lib/getugroups.c (getugroups): Detect getgrent failure.

Browse Source 
Adjust comment to reflect reality: this function may return -1.
This commit is contained in:
Jim Meyering
2007-07-06 05:01:03 +00:00
parent 852920e746
commit 66e59ae7e8
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2007-07-06 Jim Meyering <jim@meyering.net>
* lib/getugroups.c (getugroups): Detect getgrent failure.
Adjust comment to reflect reality: this function may return -1.
2007-07-05 Sergey Poznyakoff <gray@gnu.org.ua>
* build-aux/bootstrap (TP_URL,get_translations): Update to use
lib/getugroups.c
+13 -5
View File
@@ -45,14 +45,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 +62,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;
@@ -91,13 +97,15 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char const *username,
if (count < 0)
{
errno = EOVERFLOW;
count = -1;
goto done;
}
}
}
}
if (errno != 0)
count = -1;
done:
{
int saved_errno = errno;