New module 'unicase/u32-casecoll'.

[gnulib.git] / lib / getugroups.c

diff --git a/lib/getugroups.c b/lib/getugroups.c
index 7770ff0..b266bb8 100644 (file)
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -1,11 +1,11 @@
 /* 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-2008 Free Software Foundation.
 
-   This program is free software; you can redistribute it and/or modify
+   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
@@ -13,8 +13,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by David MacKenzie. */
 
@@ -22,20 +21,18 @@
 
 #include "getugroups.h"
 
+#include <limits.h>
 #include <stdio.h> /* grp.h on alpha OSF1 V2.0 uses "FILE *". */
 #include <grp.h>
 
 #include <unistd.h>
 
 #include <errno.h>
-#ifndef EOVERFLOW
-# define EOVERFLOW EINVAL
-#endif
 
 /* 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 ();
+struct group *getgrent (void);
 
 #include <string.h>
 
@@ -93,12 +90,12 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char const *username,
                    goto done;
                  grouplist[count] = grp->gr_gid;
                }
-             count++;
-             if (count < 0)
+             if (count == INT_MAX)
                {
                  errno = EOVERFLOW;
                  goto done;
                }
+             count++;
            }
        }
     }