X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetgroups.c;h=1e9cbc6495166a394fbd8a9157a77ebd5d8fde8a;hb=bd606be378ddd8404641cad023dd43f1f676b26e;hp=f6808b3333d77238063b22d908b13dc2689e79bd;hpb=58629cba356a13b4e01adc925aa13f57ba44b7f5;p=gnulib.git
diff --git a/lib/getgroups.c b/lib/getgroups.c
index f6808b333..1e9cbc649 100644
--- a/lib/getgroups.c
+++ b/lib/getgroups.c
@@ -1,10 +1,12 @@
/* provide consistent interface to getgroups for systems that don't allow N==0
- Copyright (C) 1996, 1999, 2003 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1996, 1999, 2003, 2006, 2007, 2008 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,14 +14,19 @@
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 . */
/* written by Jim Meyering */
#include
+
+#undef getgroups
+
#include
#include
+#include
+#include
+#include
#include "xalloc.h"
@@ -29,28 +36,32 @@
provided function handle all others. */
int
-getgroups (size_t n, GETGROUPS_T *group)
+rpl_getgroups (int n, GETGROUPS_T *group)
{
int n_groups;
GETGROUPS_T *gbuf;
-
-#undef getgroups
+ int saved_errno;
if (n != 0)
return getgroups (n, group);
n = 20;
- gbuf = NULL;
while (1)
{
- gbuf = xrealloc (gbuf, n * sizeof (GETGROUPS_T));
+ /* No need to worry about address arithmetic overflow here,
+ since the ancient systems that we're running on have low
+ limits on the number of secondary groups. */
+ gbuf = xmalloc (n * sizeof *gbuf);
n_groups = getgroups (n, gbuf);
if (n_groups < n)
break;
+ free (gbuf);
n += 10;
}
+ saved_errno = errno;
free (gbuf);
+ errno = saved_errno;
return n_groups;
}