From d5c32667ad11ff38dc46be527266297b38a341d1 Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Wed, 3 Dec 2008 14:04:03 +0000 Subject: Synch with trunk @ 24242 Step 18: some more synch: hidden_proto, size reduction and signal handling changes. --- libpthread/linuxthreads.old/signals.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libpthread/linuxthreads.old/signals.c') diff --git a/libpthread/linuxthreads.old/signals.c b/libpthread/linuxthreads.old/signals.c index 23ba9778f..2a451f3d2 100644 --- a/libpthread/linuxthreads.old/signals.c +++ b/libpthread/linuxthreads.old/signals.c @@ -196,7 +196,7 @@ int sigwait(const sigset_t * set, int * sig) and if not, install our dummy handler. This is conformant to POSIX: "The effect of sigwait() on the signal actions for the signals in set is unspecified." */ - sigfillset(&mask); + __sigfillset(&mask); sigdelset(&mask, __pthread_sig_cancel); for (s = 1; s <= NSIG; s++) { if (sigismember(set, s) && @@ -207,9 +207,8 @@ int sigwait(const sigset_t * set, int * sig) if (sighandler[s].old == NULL || sighandler[s].old == (arch_sighandler_t) SIG_DFL || sighandler[s].old == (arch_sighandler_t) SIG_IGN) { + memset(&sa, 0, sizeof(sa)); sa.sa_handler = pthread_null_sighandler; - sigemptyset(&sa.sa_mask); - sa.sa_flags = 0; sigaction(s, &sa, NULL); } } -- cgit v1.2.3