diff options
Diffstat (limited to 'sysdeps/posix')
| -rw-r--r-- | sysdeps/posix/open64.c | 12 | ||||
| -rw-r--r-- | sysdeps/posix/sigpause.c | 20 | ||||
| -rw-r--r-- | sysdeps/posix/sigwait.c | 23 | ||||
| -rw-r--r-- | sysdeps/posix/system.c | 12 | ||||
| -rw-r--r-- | sysdeps/posix/waitid.c | 31 |
5 files changed, 84 insertions, 14 deletions
diff --git a/sysdeps/posix/open64.c b/sysdeps/posix/open64.c index 3db5292ff5..8d8bdbac55 100644 --- a/sysdeps/posix/open64.c +++ b/sysdeps/posix/open64.c @@ -19,6 +19,7 @@ #include <fcntl.h> #include <stdarg.h> #include <bp-sym.h> +#include <sysdep-cancel.h> /* Open FILE with access OFLAG. If OFLAG includes O_CREAT, a third argument is the file protection. */ @@ -35,7 +36,16 @@ __libc_open64 (const char *file, int oflag, ...) va_end (arg); } - return __libc_open (file, oflag | O_LARGEFILE, mode); + if (SINGLE_THREAD_P) + return __libc_open (file, oflag | O_LARGEFILE, mode); + + int oldtype = LIBC_CANCEL_ASYNC (); + + int result = __libc_open (file, oflag | O_LARGEFILE, mode); + + LIBC_CANCEL_RESET (oldtype); + + return result; } weak_alias (__libc_open64, BP_SYM (__open64)) libc_hidden_weak (BP_SYM (__open64)) diff --git a/sysdeps/posix/sigpause.c b/sysdeps/posix/sigpause.c index dba6912e90..e85a813ab0 100644 --- a/sysdeps/posix/sigpause.c +++ b/sysdeps/posix/sigpause.c @@ -19,13 +19,14 @@ #include <errno.h> #include <signal.h> #include <stddef.h> /* For NULL. */ +#include <sysdep-cancel.h> #include <sigset-cvt-mask.h> /* Set the mask of blocked signals to MASK, wait for a signal to arrive, and then restore the mask. */ -int -__sigpause (int sig_or_mask, int is_sig) +static int +do_sigpause (int sig_or_mask, int is_sig) { sigset_t set; @@ -42,6 +43,21 @@ __sigpause (int sig_or_mask, int is_sig) return __sigsuspend (&set); } + +int +__sigpause (int sig_or_mask, int is_sig) +{ + if (SINGLE_THREAD_P) + return do_sigpause (sig_or_mask, is_sig); + + int oldtype = LIBC_CANCEL_ASYNC (); + + int result = do_sigpause (sig_or_mask, is_sig); + + LIBC_CANCEL_RESET (oldtype); + + return result; +} libc_hidden_def (__sigpause) /* We have to provide a default version of this function since the diff --git a/sysdeps/posix/sigwait.c b/sysdeps/posix/sigwait.c index f2be3225c4..8b422d2b9d 100644 --- a/sysdeps/posix/sigwait.c +++ b/sysdeps/posix/sigwait.c @@ -1,5 +1,5 @@ /* Implementation of sigwait function from POSIX.1c. - Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -21,6 +21,7 @@ #include <errno.h> #include <signal.h> #include <stddef.h> /* For NULL. */ +#include <sysdep-cancel.h> /* This is our dummy signal handler we use here. */ static void ignore_signal (int sig); @@ -31,8 +32,8 @@ static void ignore_signal (int sig); static int was_sig; -int -__sigwait (const sigset_t *set, int *sig) +static int +do_sigwait (const sigset_t *set, int *sig) { sigset_t tmp_mask; struct sigaction saved[NSIG]; @@ -80,6 +81,22 @@ __sigwait (const sigset_t *set, int *sig) *sig = was_sig; return was_sig == -1 ? -1 : 0; } + + +int +__sigwait (const sigset_t *set, int *sig) +{ + if (SINGLE_THREAD_P) + return do_sigwait (set, sig); + + int oldtype = LIBC_CANCEL_ASYNC (); + + int result = do_sigwait (set, sig); + + LIBC_CANCEL_RESET (oldtype); + + return result; +} libc_hidden_def (__sigwait) weak_alias (__sigwait, sigwait) diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c index 0881a3a431..bca1c2ec3e 100644 --- a/sysdeps/posix/system.c +++ b/sysdeps/posix/system.c @@ -24,6 +24,7 @@ #include <sys/types.h> #include <sys/wait.h> #include <bits/libc-lock.h> +#include <sysdep-cancel.h> #ifndef HAVE_GNU_LD @@ -185,6 +186,15 @@ __libc_system (const char *line) not be available after a chroot(), for example. */ return do_system ("exit 0") == 0; - return do_system (line); + if (SINGLE_THREAD_P) + return do_system (line); + + int oldtype = LIBC_CANCEL_ASYNC (); + + int result = do_system (line); + + LIBC_CANCEL_RESET (oldtype); + + return result; } weak_alias (__libc_system, system) diff --git a/sysdeps/posix/waitid.c b/sysdeps/posix/waitid.c index ef2ab2ed54..679d97d203 100644 --- a/sysdeps/posix/waitid.c +++ b/sysdeps/posix/waitid.c @@ -18,21 +18,18 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <assert.h> #include <errno.h> #include <signal.h> #define __need_NULL #include <stddef.h> #include <sys/wait.h> #include <sys/types.h> +#include <sysdep-cancel.h> -#include <assert.h> -int -__waitid (idtype, id, infop, options) - idtype_t idtype; - id_t id; - siginfo_t *infop; - int options; +static int +do_waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options) { pid_t pid, child; int status; @@ -118,5 +115,25 @@ __waitid (idtype, id, infop, options) return 0; } + + +int +__waitid (idtype, id, infop, options) + idtype_t idtype; + id_t id; + siginfo_t *infop; + int options; +{ + if (SINGLE_THREAD_P) + return do_waitid (idtype, id, infop, options); + + int oldtype = LIBC_CANCEL_ASYNC (); + + int result = do_waitid (idtype, id, infop, options); + + LIBC_CANCEL_RESET (oldtype); + + return result; +} weak_alias (__waitid, waitid) strong_alias (__waitid, __libc_waitid) |