diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386')
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/chown.c | 79 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/fchownat.c | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/sigaction.c | 101 |
3 files changed, 33 insertions, 150 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/chown.c b/sysdeps/unix/sysv/linux/i386/chown.c index b87605f602..c8e53e4e00 100644 --- a/sysdeps/unix/sysv/linux/i386/chown.c +++ b/sysdeps/unix/sysv/linux/i386/chown.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1998,1999,2000,2002,2003,2004,2006 - Free Software Foundation, Inc. +/* Copyright (C) 1998-2012 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 @@ -42,64 +41,22 @@ extern int __chown_is_lchown (const char *__file, uid_t __owner, extern int __real_chown (const char *__file, uid_t __owner, gid_t __group); -#if defined __NR_lchown || __ASSUME_LCHOWN_SYSCALL > 0 -/* Running under Linux > 2.1.80. */ - -# ifdef __NR_chown32 +#ifdef __NR_chown32 # if __ASSUME_32BITUIDS == 0 /* This variable is shared with all files that need to check for 32bit uids. */ extern int __libc_missing_32bit_uids; -# endif -# endif /* __NR_chown32 */ +# endif +#endif /* __NR_chown32 */ int __real_chown (const char *file, uid_t owner, gid_t group) { -# if __ASSUME_LCHOWN_SYSCALL == 0 - static int __libc_old_chown; - int result; - - if (!__libc_old_chown) - { - int saved_errno = errno; -# ifdef __NR_chown32 - if (__libc_missing_32bit_uids <= 0) - { - int result; - int saved_errno = errno; - - result = INLINE_SYSCALL (chown32, 3, CHECK_STRING (file), owner, group); - if (result == 0 || errno != ENOSYS) - return result; - - __set_errno (saved_errno); - __libc_missing_32bit_uids = 1; - } -# endif /* __NR_chown32 */ - if (((owner + 1) > (uid_t) ((__kernel_uid_t) -1U)) - || ((group + 1) > (gid_t) ((__kernel_gid_t) -1U))) - { - __set_errno (EINVAL); - return -1; - } - - result = INLINE_SYSCALL (chown, 3, CHECK_STRING (file), owner, group); - - if (result >= 0 || errno != ENOSYS) - return result; - - __set_errno (saved_errno); - __libc_old_chown = 1; - } - - return __lchown (file, owner, group); -# elif __ASSUME_32BITUIDS - /* This implies __ASSUME_LCHOWN_SYSCALL. */ +#if __ASSUME_32BITUIDS return INLINE_SYSCALL (chown32, 3, CHECK_STRING (file), owner, group); -# else - /* !__ASSUME_32BITUIDS && ASSUME_LCHOWN_SYSCALL */ -# ifdef __NR_chown32 +#else + /* !__ASSUME_32BITUIDS */ +# ifdef __NR_chown32 if (__libc_missing_32bit_uids <= 0) { int result; @@ -112,7 +69,7 @@ __real_chown (const char *file, uid_t owner, gid_t group) __set_errno (saved_errno); __libc_missing_32bit_uids = 1; } -# endif /* __NR_chown32 */ +# endif /* __NR_chown32 */ if (((owner + 1) > (uid_t) ((__kernel_uid_t) -1U)) || ((group + 1) > (gid_t) ((__kernel_gid_t) -1U))) { @@ -121,19 +78,11 @@ __real_chown (const char *file, uid_t owner, gid_t group) } return INLINE_SYSCALL (chown, 3, CHECK_STRING (file), owner, group); -# endif -} #endif +} -#if !defined __NR_lchown && __ASSUME_LCHOWN_SYSCALL == 0 -/* Compiling under older kernels. */ -int -__chown_is_lchown (const char *file, uid_t owner, gid_t group) -{ - return INLINE_SYSCALL (chown, 3, CHECK_STRING (file), owner, group); -} -#elif SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) +#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) /* Compiling for compatibiity. */ int attribute_compat_text_section @@ -147,12 +96,6 @@ __chown_is_lchown (const char *file, uid_t owner, gid_t group) compat_symbol (libc, __chown_is_lchown, chown, GLIBC_2_0); #endif -#ifdef __NR_lchown versioned_symbol (libc, __real_chown, chown, GLIBC_2_1); strong_alias (__real_chown, __chown) -#else -strong_alias (__chown_is_lchown, __chown_is_lchown21) -versioned_symbol (libc, __chown_is_lchown21, chown, GLIBC_2_1); -strong_alias (__chown_is_lchown, __chown) -#endif libc_hidden_def (__chown) diff --git a/sysdeps/unix/sysv/linux/i386/fchownat.c b/sysdeps/unix/sysv/linux/i386/fchownat.c index 573a9b33c8..6b748d16ba 100644 --- a/sysdeps/unix/sysv/linux/i386/fchownat.c +++ b/sysdeps/unix/sysv/linux/i386/fchownat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2005-2012 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 @@ -84,7 +84,6 @@ fchownat (int fd, const char *file, uid_t owner, gid_t group, int flag) } # if __ASSUME_32BITUIDS > 0 - /* This implies __ASSUME_LCHOWN_SYSCALL. */ INTERNAL_SYSCALL_DECL (err); if (flag & AT_SYMLINK_NOFOLLOW) diff --git a/sysdeps/unix/sysv/linux/i386/sigaction.c b/sysdeps/unix/sysv/linux/i386/sigaction.c index 6424c7c24b..df5c235e5a 100644 --- a/sysdeps/unix/sysv/linux/i386/sigaction.c +++ b/sysdeps/unix/sysv/linux/i386/sigaction.c @@ -1,5 +1,5 @@ /* POSIX.1 `sigaction' call for Linux/i386. - Copyright (C) 1991,1995-2000,2002-2005,2006 Free Software Foundation, Inc. + Copyright (C) 1991-2012 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 @@ -37,12 +37,6 @@ #define SA_RESTORER 0x04000000 -#if __ASSUME_REALTIME_SIGNALS == 0 -/* The variable is shared between all wrappers around signal handling - functions which have RT equivalents. */ -int __libc_missing_rt_sigs; -#endif - /* Using the hidden attribute here does not change the code but it helps to avoid warnings. */ #ifdef __NR_rt_sigaction @@ -56,92 +50,39 @@ extern void restore (void) asm ("__restore") attribute_hidden; int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact) { -#if __ASSUME_REALTIME_SIGNALS == 0 - struct old_kernel_sigaction k_newact, k_oldact; -#endif int result; -#ifdef __NR_rt_sigaction + struct kernel_sigaction kact, koact; - /* First try the RT signals. */ -# if __ASSUME_REALTIME_SIGNALS == 0 - if (!__libc_missing_rt_sigs) -# endif + if (act) { - struct kernel_sigaction kact, koact; -# if __ASSUME_REALTIME_SIGNALS == 0 - int saved_errno = errno; -# endif + kact.k_sa_handler = act->sa_handler; + kact.sa_flags = act->sa_flags; + memcpy (&kact.sa_mask, &act->sa_mask, sizeof (sigset_t)); - if (act) + if (GLRO(dl_sysinfo_dso) == NULL) { - kact.k_sa_handler = act->sa_handler; - kact.sa_flags = act->sa_flags; - memcpy (&kact.sa_mask, &act->sa_mask, sizeof (sigset_t)); + kact.sa_flags |= SA_RESTORER; - if (GLRO(dl_sysinfo_dso) == NULL) - { - kact.sa_flags |= SA_RESTORER; - - kact.sa_restorer = ((act->sa_flags & SA_SIGINFO) - ? &restore_rt : &restore); - } - } - - /* XXX The size argument hopefully will have to be changed to the - real size of the user-level sigset_t. */ - result = INLINE_SYSCALL (rt_sigaction, 4, - sig, act ? __ptrvalue (&kact) : NULL, - oact ? __ptrvalue (&koact) : NULL, _NSIG / 8); - -# if __ASSUME_REALTIME_SIGNALS == 0 - if (result >= 0 || errno != ENOSYS) -# endif - { - if (oact && result >= 0) - { - oact->sa_handler = koact.k_sa_handler; - memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (sigset_t)); - oact->sa_flags = koact.sa_flags; - oact->sa_restorer = koact.sa_restorer; - } - return result; + kact.sa_restorer = ((act->sa_flags & SA_SIGINFO) + ? &restore_rt : &restore); } - -# if __ASSUME_REALTIME_SIGNALS == 0 - __set_errno (saved_errno); - __libc_missing_rt_sigs = 1; -# endif - } -#endif - -#if __ASSUME_REALTIME_SIGNALS == 0 - if (act) - { - k_newact.k_sa_handler = act->sa_handler; - k_newact.sa_mask = act->sa_mask.__val[0]; - k_newact.sa_flags = act->sa_flags | SA_RESTORER; - - k_newact.sa_restorer = &restore; } - result = INLINE_SYSCALL (sigaction, 3, sig, - act ? __ptrvalue (&k_newact) : 0, - oact ? __ptrvalue (&k_oldact) : 0); - - if (result < 0) - return -1; + /* XXX The size argument hopefully will have to be changed to the + real size of the user-level sigset_t. */ + result = INLINE_SYSCALL (rt_sigaction, 4, + sig, act ? __ptrvalue (&kact) : NULL, + oact ? __ptrvalue (&koact) : NULL, _NSIG / 8); - if (oact) + if (oact && result >= 0) { - oact->sa_handler = k_oldact.k_sa_handler; - oact->sa_mask.__val[0] = k_oldact.sa_mask; - oact->sa_flags = k_oldact.sa_flags; - oact->sa_restorer = k_oldact.sa_restorer; + oact->sa_handler = koact.k_sa_handler; + memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (sigset_t)); + oact->sa_flags = koact.sa_flags; + oact->sa_restorer = koact.sa_restorer; } - - return 0; -#endif + return result; } libc_hidden_def (__libc_sigaction) |