Merge from coreutils.

[gnulib.git] / lib / getugroups.c

diff --git a/lib/getugroups.c b/lib/getugroups.c
index c802071..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
-   Copyright (C) 1990, 1991 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
@@ -18,7 +18,7 @@
 /* Written by David MacKenzie. */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #include <sys/types.h>
@@ -26,7 +26,7 @@
 #include <grp.h>
 
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 
 /* setgrent, getgrent, and endgrent are not specified by POSIX.1,
@@ -35,41 +35,63 @@
    You lose!  */
 struct group *getgrent ();
 
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #include <string.h>
-#else
-#include <strings.h>
-#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.
+   Always return the number of groups of which USERNAME is a member.  */
 
 int
-getugroups (maxcount, grouplist, username)
-     int maxcount;
-     GETGROUPS_T *grouplist;
-     char *username;
+getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
 {
   struct group *grp;
   register char **cp;
   register 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))
+    {
+      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)
                {
-                 endgrent ();
-                 return count;
+                 if (count >= maxcount)
+                   {
+                     endgrent ();
+                     return count;
+                   }
+                 grouplist[count] = grp->gr_gid;
                }
-             grouplist[count] = grp->gr_gid;
+             count++;
            }
-         count++;
        }
+    }
   endgrent ();
+
   return count;
 }