Don't include <config.h> twice; this doesn't work in some cases,

[gnulib.git] / lib / getugroups.c

diff --git a/lib/getugroups.c b/lib/getugroups.c
index 44aeb80..970192e 100644 (file)
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -1,5 +1,7 @@
 /* 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, 2004, 2005, 2006
+   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
@@ -13,33 +15,29 @@
 
    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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by David MacKenzie. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <sys/types.h>
 #include <stdio.h> /* grp.h on alpha OSF1 V2.0 uses "FILE *". */
 #include <grp.h>
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
+#include <unistd.h>
+
+#include <errno.h>
+#ifndef EOVERFLOW
+# define EOVERFLOW EINVAL
 #endif
 
-/* setgrent, getgrent, and endgrent are not specified by POSIX.1,
-   so header files might not declare them.
+/* 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 ();
 
-#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))
 
@@ -57,7 +55,7 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
   register char **cp;
   register int count = 0;
 
-  if (gid != -1)
+  if (gid != (gid_t) -1)
     {
       if (maxcount != 0)
        grouplist[count] = gid;
@@ -92,6 +90,11 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
                  grouplist[count] = grp->gr_gid;
                }
              count++;
+             if (count < 0)
+               {
+                 errno = EOVERFLOW;
+                 return -1;
+               }
            }
        }
     }