X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fgetgroups.c;h=87e1679253f033243a70192c65d63a585c3461f5;hb=b344de996cd51f8a2f2558a3172016b64d99c622;hp=717f90e4acc6049623302d84fc5c01b81efb4b13;hpb=4dc7e74d299f19bce7337f1c7dfda7d455a77c19;p=gnulib.git
diff --git a/lib/getgroups.c b/lib/getgroups.c
index 717f90e4a..87e167925 100644
--- a/lib/getgroups.c
+++ b/lib/getgroups.c
@@ -1,10 +1,11 @@
/* provide consistent interface to getgroups for systems that don't allow N==0
- Copyright (C) 1996 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1996, 1999, 2003, 2006-2011 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,46 +13,104 @@
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
-#include
-#include
-char *xmalloc ();
+#include
+
+#include
+#include
+#include
-/* On Ultrix 4.3, getgroups (0, 0) always fails.
- This function handles that special case and lets the system-
- provided function handle all others. */
+#if !HAVE_GETGROUPS
+/* Provide a stub that fails with ENOSYS, since there is no group
+ information available on mingw. */
int
-getgroups (n, group)
- size_t n;
- GETGROUPS_T *group;
+getgroups (int n _GL_UNUSED, GETGROUPS_T *groups _GL_UNUSED)
{
- int ng;
+ errno = ENOSYS;
+ return -1;
+}
+
+#else /* HAVE_GETGROUPS */
+
+# undef getgroups
+# ifndef GETGROUPS_ZERO_BUG
+# define GETGROUPS_ZERO_BUG 0
+# endif
+
+/* On at least Ultrix 4.3 and NextStep 3.2, getgroups (0, NULL) always
+ fails. On other systems, it returns the number of supplemental
+ groups for the process. This function handles that special case
+ and lets the system-provided function handle all others. However,
+ it can fail with ENOMEM if memory is tight. It is unspecified
+ whether the effective group id is included in the list. */
+
+int
+rpl_getgroups (int n, gid_t *group)
+{
+ int n_groups;
GETGROUPS_T *gbuf;
+ int saved_errno;
-#undef getgroups
+ if (n < 0)
+ {
+ errno = EINVAL;
+ return -1;
+ }
- if (n != 0)
- return getgroups (n, group);
+ if (n != 0 || !GETGROUPS_ZERO_BUG)
+ {
+ int result;
+ if (sizeof *group == sizeof *gbuf)
+ return getgroups (n, (GETGROUPS_T *) group);
+
+ if (SIZE_MAX / sizeof *gbuf <= n)
+ {
+ errno = ENOMEM;
+ return -1;
+ }
+ gbuf = malloc (n * sizeof *gbuf);
+ if (!gbuf)
+ return -1;
+ result = getgroups (n, gbuf);
+ if (0 <= result)
+ {
+ n = result;
+ while (n--)
+ group[n] = gbuf[n];
+ }
+ saved_errno = errno;
+ free (gbuf);
+ errno == saved_errno;
+ return result;
+ }
n = 20;
- gbuf = NULL;
while (1)
{
- gbuf = (GETGROUPS_T *) xrealloc (gbuf, n * sizeof (GETGROUPS_T));
- ng = getgroups (n, gbuf);
- if (ng < n)
- break;
- n += 10;
+ /* 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 = malloc (n * sizeof *gbuf);
+ if (!gbuf)
+ return -1;
+ n_groups = getgroups (n, gbuf);
+ if (n_groups == -1 ? errno != EINVAL : n_groups < n)
+ break;
+ free (gbuf);
+ n *= 2;
}
+ saved_errno = errno;
free (gbuf);
+ errno = saved_errno;
- return ng;
+ return n_groups;
}
+
+#endif /* HAVE_GETGROUPS */