diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/signals.c | 33 | ||||
| -rw-r--r-- | Src/signals.h | 24 |
3 files changed, 21 insertions, 40 deletions
diff --git a/ChangeLog b/ChangeLog index 24cf1c3f5..c53206478 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-05-01 Peter Stephenson <pws@csr.com> + * Guillaume Chazarain: 23364: Src/signals.c, Src/signals.h: fix + race in POSIX signal blocking - use local variables as other forms + already do. + * 23363: README (not posted), Doc/Zsh/compsys.yo, Src/Zle/computil.c: fake-files style now takes pattern. diff --git a/Src/signals.c b/Src/signals.c index 8f5bc49b8..ba01e2bc9 100644 --- a/Src/signals.c +++ b/Src/signals.c @@ -200,15 +200,6 @@ signal_mask(int sig) * set. Return the old signal set. */ /**/ -#ifdef POSIX_SIGNALS - -/**/ -mod_export sigset_t dummy_sigset1, dummy_sigset2; - -/**/ -#else - -/**/ #ifndef BSD_SIGNALS sigset_t @@ -216,7 +207,11 @@ signal_block(sigset_t set) { sigset_t oset; -#ifdef SYSV_SIGNALS +#ifdef POSIX_SIGNALS + sigprocmask(SIG_BLOCK, &set, &oset); + +#else +# ifdef SYSV_SIGNALS int i; oset = blocked_set; @@ -226,7 +221,7 @@ signal_block(sigset_t set) sighold(i); } } -#else /* NO_SIGNAL_BLOCKING */ +# else /* NO_SIGNAL_BLOCKING */ /* We will just ignore signals if the system doesn't have * * the ability to block them. */ int i; @@ -238,7 +233,8 @@ signal_block(sigset_t set) signal_ignore(i); } } -#endif /* SYSV_SIGNALS */ +# endif /* SYSV_SIGNALS */ +#endif /* POSIX_SIGNALS */ return oset; } @@ -246,19 +242,17 @@ signal_block(sigset_t set) /**/ #endif /* BSD_SIGNALS */ -/**/ -#endif /* POSIX_SIGNALS */ - /* Unblock the signals in the given signal * * set. Return the old signal set. */ -#ifndef POSIX_SIGNALS - sigset_t signal_unblock(sigset_t set) { sigset_t oset; - + +#ifdef POSIX_SIGNALS + sigprocmask(SIG_UNBLOCK, &set, &oset); +#else # ifdef BSD_SIGNALS sigfillset(&oset); oset = sigsetmask(oset); @@ -288,12 +282,11 @@ signal_unblock(sigset_t set) } # endif /* SYSV_SIGNALS */ # endif /* BSD_SIGNALS */ +#endif /* POSIX_SIGNALS */ return oset; } -#endif /* POSIX_SIGNALS */ - /* set the process signal mask to * * be the given signal mask */ diff --git a/Src/signals.h b/Src/signals.h index 999040908..9541a1a02 100644 --- a/Src/signals.h +++ b/Src/signals.h @@ -100,26 +100,10 @@ #define restore_queue_signals(q) (queueing_enabled = (q)) -/* Make some signal functions faster. */ - -#ifdef POSIX_SIGNALS -#define signal_block(S) \ - ((dummy_sigset1 = (S)), \ - sigprocmask(SIG_BLOCK, &dummy_sigset1, &dummy_sigset2), \ - dummy_sigset2) -#else -# ifdef BSD_SIGNALS +#ifdef BSD_SIGNALS #define signal_block(S) sigblock(S) -# else -extern sigset_t signal_block _((sigset_t)); -# endif /* BSD_SIGNALS */ -#endif /* POSIX_SIGNALS */ - -#ifdef POSIX_SIGNALS -#define signal_unblock(S) \ - ((dummy_sigset1 = (S)), \ - sigprocmask(SIG_UNBLOCK, &dummy_sigset1, &dummy_sigset2), \ - dummy_sigset2) #else +extern sigset_t signal_block _((sigset_t)); +#endif /* BSD_SIGNALS */ + extern sigset_t signal_unblock _((sigset_t)); -#endif /* POSIX_SIGNALS */ |