projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
verify: new macro 'assume'
[gnulib.git]
/
lib
/
getgroups.c
diff --git
a/lib/getgroups.c
b/lib/getgroups.c
index
e4540fe
..
e71b543
100644
(file)
--- a/
lib/getgroups.c
+++ b/
lib/getgroups.c
@@
-1,7
+1,6
@@
/* provide consistent interface to getgroups for systems that don't allow N==0
/* provide consistent interface to getgroups for systems that don't allow N==0
- Copyright (C) 1996, 1999, 2003, 2006, 2007, 2008, 2009 Free
- Software Foundation, Inc.
+ Copyright (C) 1996, 1999, 2003, 2006-2013 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
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
@@
-24,13
+23,14
@@
#include <errno.h>
#include <stdlib.h>
#include <errno.h>
#include <stdlib.h>
+#include <stdint.h>
#if !HAVE_GETGROUPS
/* Provide a stub that fails with ENOSYS, since there is no group
information available on mingw. */
int
#if !HAVE_GETGROUPS
/* Provide a stub that fails with ENOSYS, since there is no group
information available on mingw. */
int
-getgroups (int n _
UNUSED_PARAMETER_, GETGROUPS_T *groups _UNUSED_PARAMETER_
)
+getgroups (int n _
GL_UNUSED, GETGROUPS_T *groups _GL_UNUSED
)
{
errno = ENOSYS;
return -1;
{
errno = ENOSYS;
return -1;
@@
-39,6
+39,9
@@
getgroups (int n _UNUSED_PARAMETER_, GETGROUPS_T *groups _UNUSED_PARAMETER_)
#else /* HAVE_GETGROUPS */
# undef getgroups
#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
/* On at least Ultrix 4.3 and NextStep 3.2, getgroups (0, NULL) always
fails. On other systems, it returns the number of supplemental
@@
-54,18
+57,18
@@
rpl_getgroups (int n, gid_t *group)
GETGROUPS_T *gbuf;
int saved_errno;
GETGROUPS_T *gbuf;
int saved_errno;
- if (n != 0)
+ if (n < 0)
+ {
+ errno = EINVAL;
+ return -1;
+ }
+
+ if (n != 0 || !GETGROUPS_ZERO_BUG)
{
int result;
{
int result;
- int saved_errno;
if (sizeof *group == sizeof *gbuf)
return getgroups (n, (GETGROUPS_T *) group);
if (sizeof *group == sizeof *gbuf)
return getgroups (n, (GETGROUPS_T *) group);
- if (n < 0)
- {
- errno = EINVAL;
- return -1;
- }
if (SIZE_MAX / sizeof *gbuf <= n)
{
errno = ENOMEM;
if (SIZE_MAX / sizeof *gbuf <= n)
{
errno = ENOMEM;
@@
-83,7
+86,7
@@
rpl_getgroups (int n, gid_t *group)
}
saved_errno = errno;
free (gbuf);
}
saved_errno = errno;
free (gbuf);
- errno =
=
saved_errno;
+ errno = saved_errno;
return result;
}
return result;
}