X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetugroups.c;h=d6634baf06d57b2bb60e1f2a2c07806ad388deca;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=b5e26877787168c898ea88d69e773ac6b70e5802;hpb=83bac006af8beaec5c6f7ca46bc5110ff3090f89;p=gnulib.git

diff --git a/lib/getugroups.c b/lib/getugroups.c
index b5e268777..d6634baf0 100644
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -1,10 +1,11 @@
 /* getugroups.c -- return a list of the groups a user is in
-   Copyright (C) 1990, 1991, 1998, 1999, 2000, 2003 Free Software Foundation.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 1990-1991, 1998-2000, 2003-2014 Free Software Foundation, Inc.
+
+   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
@@ -12,86 +13,113 @@
    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 <http://www.gnu.org/licenses/>.  */
 
 /* Written by David MacKenzie. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
+#include "getugroups.h"
 
-#include <sys/types.h>
+#include <errno.h>
+#include <limits.h>
 #include <stdio.h> /* grp.h on alpha OSF1 V2.0 uses "FILE *". */
-#include <grp.h>
+#include <string.h>
+#include <unistd.h>
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#if !HAVE_GRP_H
 
-/* setgrent, getgrent, and endgrent are not specified by POSIX.1,
-   so header files might not declare them.
-   If you don't have them at all, we can't implement this function.
-   You lose!  */
-struct group *getgrent ();
+/* Mingw lacks all things related to group management.  The best we
+   can do is fail with ENOSYS.  */
 
-#include <string.h>
+int
+getugroups (int maxcount _GL_UNUSED,
+            gid_t *grouplist _GL_UNUSED,
+            char const *username _GL_UNUSED,
+            gid_t gid _GL_UNUSED)
+{
+  errno = ENOSYS;
+  return -1;
+}
 
-#define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
+#else /* HAVE_GRP_H */
+# include <grp.h>
 
-/* Like `getgroups', but for user USERNAME instead of for the current
+# define STREQ(a, b) (strcmp (a, b) == 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.  */
+   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, gid_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)
     {
       if (maxcount != 0)
-	grouplist[count] = gid;
+        grouplist[count] = gid;
       ++count;
     }
 
   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;
-
-	  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 (maxcount != 0)
-		{
-		  if (count >= maxcount)
-		    {
-		      endgrent ();
-		      return count;
-		    }
-		  grouplist[count] = grp->gr_gid;
-		}
-	      count++;
-	    }
-	}
+        {
+          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 (maxcount != 0)
+                {
+                  if (count >= maxcount)
+                    goto done;
+                  grouplist[count] = grp->gr_gid;
+                }
+              if (count == INT_MAX)
+                {
+                  errno = EOVERFLOW;
+                  goto done;
+                }
+              count++;
+            }
+        }
     }
-  endgrent ();
+
+  if (errno != 0)
+    count = -1;
+
+ done:
+  {
+    int saved_errno = errno;
+    endgrent ();
+    errno = saved_errno;
+  }
 
   return count;
 }
+
+#endif /* HAVE_GRP_H */