(oatoi): declare arg to be const

[gnulib.git] / lib / getugroups.c

diff --git a/lib/getugroups.c b/lib/getugroups.c
index 6c818f1..afa425b 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 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
@@ -45,10 +45,7 @@ struct group *getgrent ();
    the current process. */
 
 int
-getugroups (maxcount, grouplist, username)
-     int maxcount;
-     GETGROUPS_T *grouplist;
-     char *username;
+getugroups (int maxcount, GETGROUPS_T *grouplist, char *username)
 {
   struct group *grp;
   register char **cp;
@@ -59,16 +56,27 @@ getugroups (maxcount, grouplist, username)
     for (cp = grp->gr_mem; *cp; ++cp)
       if (!strcmp (username, *cp))
        {
-         if (maxcount != 0)
+         int n;
+
+         /* See if this group number is already on the list.  */
+         for (n = 0; n < count; ++n)
+           if (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;