diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/setfsgid.c | 18 |
2 files changed, 16 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index e942ef94f8..a4c2cee261 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-03-26 GOTO Masanori <gotom@debian.or.jp> + + * sysdeps/unix/sysv/linux/i386/setfsuid.c: Use INTERNAL_SYSCALL and + do not check for errors (unless testing for 32bit variant). + * sysdeps/unix/sysv/linux/i386/setfsgid.c: Likewise. + 2003-03-27 Philip Blundell <philb@gnu.org> * sysdeps/unix/sysv/linux/arm/sysdep.h (PSEUDO_RET_NOERRNO): Use diff --git a/sysdeps/unix/sysv/linux/i386/setfsgid.c b/sysdeps/unix/sysv/linux/i386/setfsgid.c index 671cf3a59b..e5bab90e66 100644 --- a/sysdeps/unix/sysv/linux/i386/setfsgid.c +++ b/sysdeps/unix/sysv/linux/i386/setfsgid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -35,27 +35,28 @@ extern int __syscall_setfsgid32 (__kernel_gid32_t); # if __ASSUME_32BITUIDS == 0 /* This variable is shared with all files that need to check for 32bit uids. */ -extern int __libc_missing_32bit_uids; +extern int __libc_missing_32bit_uids attribute_hidden; # endif # endif /* __NR_setfsgid32 */ int setfsgid (gid_t gid) { + INTERNAL_SYSCALL_DECL (err); # if __ASSUME_32BITUIDS > 0 - return INLINE_SYSCALL (setfsgid32, 1, gid); + /* No error checking. */ + return INTERNAL_SYSCALL (setfsuid32, err, 1, uid); # else # ifdef __NR_setfsgid32 if (__libc_missing_32bit_uids <= 0) { int result; - int saved_errno = errno; - result = INLINE_SYSCALL (setfsgid32, 1, gid); - if (result == 0 || errno != ENOSYS) + result = INTERNAL_SYSCALL (setfsuid32, err, 1, uid); + if (! INTERNAL_SYSCALL_ERROR_P (result, err) + || INTERNAL_SYSCALL_ERRNO (result, err) != ENOSYS) return result; - __set_errno (saved_errno); __libc_missing_32bit_uids = 1; } # endif /* __NR_setfsgid32 */ @@ -65,7 +66,8 @@ setfsgid (gid_t gid) return -1; } - return INLINE_SYSCALL (setfsgid, 1, gid); + /* No error checking. */ + return INTERNAL_SYSCALL (setfsuid, err, 1, uid); # endif } #endif |