diff options
author | Ulrich Drepper <drepper@redhat.com> | 2004-11-12 01:15:06 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2004-11-12 01:15:06 +0000 |
commit | 85bd63313720ed5e7f10427ec5f0d2f59ee23614 (patch) | |
tree | c370d07825bc9f517c39de279a4b92650ad4c836 /sysdeps/unix/sysv/linux/i386/setgid.c | |
parent | 29311370cd23623cc227a67c54ae3bdd0f7d7058 (diff) | |
download | glibc-85bd63313720ed5e7f10427ec5f0d2f59ee23614.zip glibc-85bd63313720ed5e7f10427ec5f0d2f59ee23614.tar.gz glibc-85bd63313720ed5e7f10427ec5f0d2f59ee23614.tar.bz2 |
Remove sys/syscall.h, sys/types.h, linux/posix_types.h, sysdep.h and pthread-functions.h includes. Include setxid.h. Use INLINE_SETXID_SYSCALL macro instead of INLINE_SYSCALL, kill the HAVE_PTR__NPTL_SETXID guarded snippets.
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386/setgid.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/setgid.c | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/setgid.c b/sysdeps/unix/sysv/linux/i386/setgid.c index 17bfc3e..19b1e9f 100644 --- a/sysdeps/unix/sysv/linux/i386/setgid.c +++ b/sysdeps/unix/sysv/linux/i386/setgid.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1998, 2000, 2003, 2004 - Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000, 2003, 2004 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 @@ -19,15 +18,8 @@ #include <errno.h> #include <unistd.h> -#include <sys/types.h> - -#include <sysdep.h> -#include <sys/syscall.h> - -#include <linux/posix_types.h> - +#include <setxid.h> #include "kernel-features.h" -#include <pthread-functions.h> #ifdef __NR_setgid32 @@ -44,14 +36,14 @@ __setgid (gid_t gid) int result; #if __ASSUME_32BITUIDS > 0 - result = INLINE_SYSCALL (setgid32, 1, gid); + result = INLINE_SETXID_SYSCALL (setgid32, 1, gid); #else # ifdef __NR_setgid32 if (__libc_missing_32bit_uids <= 0) { int saved_errno = errno; - result = INLINE_SYSCALL (setgid32, 1, gid); + result = INLINE_SETXID_SYSCALL (setgid32, 1, gid); if (result == 0) goto out; @@ -70,22 +62,12 @@ __setgid (gid_t gid) return -1; } - result = INLINE_SYSCALL (setgid, 1, gid); + result = INLINE_SETXID_SYSCALL (setgid, 1, gid); # ifdef __NR_setgid32 out: # endif #endif -#if defined HAVE_PTR__NPTL_SETXID && !defined SINGLE_THREAD - if (result == 0 && __libc_pthread_functions.ptr__nptl_setxid != NULL) - { - struct xid_command cmd; - cmd.syscall_no = __NR_setgid32; - cmd.id[0] = gid; - __libc_pthread_functions.ptr__nptl_setxid (&cmd); - } -#endif - return result; } #ifndef __setgid |