projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.
[gnulib.git]
/
lib
/
getugroups.c
diff --git
a/lib/getugroups.c
b/lib/getugroups.c
index
6fad8b7
..
b5e2687
100644
(file)
--- a/
lib/getugroups.c
+++ b/
lib/getugroups.c
@@
-1,5
+1,5
@@
/* getugroups.c -- return a list of the groups a user is in
/* getugroups.c -- return a list of the groups a user is in
- Copyright (C) 1990, 1991, 1998, 1999 Free Software Foundation.
+ Copyright (C) 1990, 1991, 1998, 1999
, 2000, 2003
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
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
@@
-35,11
+35,9
@@
You lose! */
struct group *getgrent ();
You lose! */
struct group *getgrent ();
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
+
+#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.
/* Like `getgroups', but for user USERNAME instead of for the current
process. Store at most MAXCOUNT group IDs in the GROUPLIST array.
@@
-55,7
+53,7
@@
getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
register char **cp;
register int count = 0;
register char **cp;
register int count = 0;
- if (gid != -1)
+ if (gid !=
(gid_t)
-1)
{
if (maxcount != 0)
grouplist[count] = gid;
{
if (maxcount != 0)
grouplist[count] = gid;
@@
-64,14
+62,17
@@
getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
setgrent ();
while ((grp = getgrent ()) != 0)
setgrent ();
while ((grp = getgrent ()) != 0)
- for (cp = grp->gr_mem; *cp; ++cp)
-
if (!strcmp (username, *cp)
)
+ {
+
for (cp = grp->gr_mem; *cp; ++cp
)
{
int n;
{
int n;
+ if ( ! STREQ (username, *cp))
+ continue;
+
/* See if this group number is already on the list. */
for (n = 0; n < count; ++n)
/* See if this group number is already on the list. */
for (n = 0; n < count; ++n)
- if (grouplist[n] == grp->gr_gid)
+ if (grouplist
&& grouplist
[n] == grp->gr_gid)
break;
/* If it's a new group number, then try to add it to the list. */
break;
/* If it's a new group number, then try to add it to the list. */
@@
-89,6
+90,8
@@
getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
count++;
}
}
count++;
}
}
+ }
endgrent ();
endgrent ();
+
return count;
}
return count;
}