diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2006-12-05 21:37:43 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2006-12-05 21:37:43 +0000 |
commit | b1c243824ff52877c270658e9c66083930e78ac8 (patch) | |
tree | cfb3a2ba1b5913033deb9e0387c1a0b9a3295d44 /libc/sysdeps/unix/sysv/linux/i386/getgroups.c | |
parent | ddd02823a270adb6fe6eb8c55d90142a63a738c1 (diff) | |
download | eglibc2-b1c243824ff52877c270658e9c66083930e78ac8.tar.gz |
Merge changes between r677 and r858 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@859 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/unix/sysv/linux/i386/getgroups.c')
-rw-r--r-- | libc/sysdeps/unix/sysv/linux/i386/getgroups.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libc/sysdeps/unix/sysv/linux/i386/getgroups.c b/libc/sysdeps/unix/sysv/linux/i386/getgroups.c index b7a0a4efd..f69baf943 100644 --- a/libc/sysdeps/unix/sysv/linux/i386/getgroups.c +++ b/libc/sysdeps/unix/sysv/linux/i386/getgroups.c @@ -52,8 +52,6 @@ __getgroups (int n, gid_t *groups) } else { - int i, ngids; - __kernel_gid_t kernel_groups[n = MIN (n, __sysconf (_SC_NGROUPS_MAX))]; # ifdef __NR_getgroups32 if (__libc_missing_32bit_uids <= 0) { @@ -69,6 +67,9 @@ __getgroups (int n, gid_t *groups) } # endif /* __NR_getgroups32 */ + int i, ngids; + __kernel_gid_t kernel_groups[n = MIN (n, __sysconf (_SC_NGROUPS_MAX))]; + ngids = INLINE_SYSCALL (getgroups, 2, n, CHECK_N (kernel_groups, n)); if (n != 0 && ngids > 0) for (i = 0; i < ngids; i++) |