X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetugroups.c;h=299bae685f80f484a98f88720ed1ffa332bd587e;hb=32d1664e8e930d8fa6a29db4caac4d21623e42c8;hp=4b8752f6b669d564f04561e3bb3bba07d19feb87;hpb=a76230b70f5f81c63fbb43debf8d690885537de4;p=gnulib.git

diff --git a/lib/getugroups.c b/lib/getugroups.c
index 4b8752f6b..299bae685 100644
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -1,6 +1,6 @@
 /* getugroups.c -- return a list of the groups a user is in
 
-   Copyright (C) 1990, 1991, 1998-2000, 2003-2007 Free Software Foundation.
+   Copyright (C) 1990-1991, 1998-2000, 2003-2010 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
@@ -21,25 +21,31 @@
 
 #include "getugroups.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>
 
-#include <errno.h>
-#ifndef EOVERFLOW
-# define EOVERFLOW EINVAL
-#endif
+#if !HAVE_GRP_H
 
-/* Some old header files might not declare setgrent, getgrent, and endgrent.
-   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>
+
+# 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.
@@ -49,15 +55,15 @@ struct group *getgrent ();
    Otherwise, return the number of IDs we've written into GROUPLIST.  */
 
 int
-getugroups (int maxcount, GETGROUPS_T *grouplist, char const *username,
-	    gid_t gid)
+getugroups (int maxcount, gid_t *grouplist, char const *username,
+            gid_t gid)
 {
   int count = 0;
 
   if (gid != (gid_t) -1)
     {
       if (maxcount != 0)
-	grouplist[count] = gid;
+        grouplist[count] = gid;
       ++count;
     }
 
@@ -70,37 +76,37 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char const *username,
       errno = 0;
       grp = getgrent ();
       if (grp == NULL)
-	break;
+        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)
-		    goto done;
-		  grouplist[count] = grp->gr_gid;
-		}
-	      if (count == INT_MAX)
-		{
-		  errno = EOVERFLOW;
-		  goto done;
-		}
-	      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++;
+            }
+        }
     }
 
   if (errno != 0)
@@ -115,3 +121,5 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char const *username,
 
   return count;
 }
+
+#endif /* HAVE_GRP_H */