diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-15 11:18:37 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-15 11:18:37 -0700 |
| commit | b6e9e0ffacf249934e92448e85e965e90aa3cf4b (patch) | |
| tree | 21abdf10950da2d63a8841b068b9e360b5e35cc9 | |
| parent | ce811ad97550ff70e2bd71e1ada496b4715d9b08 (diff) | |
Merge from gnulib.
2012-07-15 pthread_sigmask: fix bug on FreeBSD 9 (Bug#11884)
2012-07-11 gettext: do not assume '#define ... defined ...' behavior
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/gettext.h | 9 | ||||
| -rw-r--r-- | lib/pthread_sigmask.c | 27 |
3 files changed, 37 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2012-07-15 Paul Eggert <eggert@cs.ucla.edu> + + Merge from gnulib, incorporating: + 2012-07-15 pthread_sigmask: fix bug on FreeBSD 9 (Bug#11884) + 2012-07-11 gettext: do not assume '#define ... defined ...' behavior + 2012-07-14 Glenn Morris <rgm@gnu.org> * configure.ac (GC_SETJMP_WORKS, GC_MARK_STACK): Move here from src/s. diff --git a/lib/gettext.h b/lib/gettext.h index 75875cdb0f..65ca1e6762 100644 --- a/lib/gettext.h +++ b/lib/gettext.h @@ -183,9 +183,12 @@ npgettext_aux (const char *domain, #include <string.h> -#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \ - (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \ - /* || __STDC_VERSION__ >= 199901L */ ) +#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \ + /* || __STDC_VERSION__ >= 199901L */ ) +# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1 +#else +# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0 +#endif #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS #include <stdlib.h> diff --git a/lib/pthread_sigmask.c b/lib/pthread_sigmask.c index 4a150e70e9..80ab24bf0b 100644 --- a/lib/pthread_sigmask.c +++ b/lib/pthread_sigmask.c @@ -22,6 +22,10 @@ #include <errno.h> #include <stddef.h> +#if PTHREAD_SIGMASK_INEFFECTIVE +# include <string.h> +#endif + #if PTHREAD_SIGMASK_UNBLOCK_BUG # include <unistd.h> #endif @@ -31,7 +35,22 @@ pthread_sigmask (int how, const sigset_t *new_mask, sigset_t *old_mask) #undef pthread_sigmask { #if HAVE_PTHREAD_SIGMASK - int ret = pthread_sigmask (how, new_mask, old_mask); + int ret; + +# if PTHREAD_SIGMASK_INEFFECTIVE + sigset_t omask, omask_copy; + sigset_t *old_mask_ptr = &omask; + sigemptyset (&omask); + /* Add a signal unlikely to be blocked, so that OMASK_COPY + is unlikely to match the actual mask. */ + sigaddset (&omask, SIGILL); + memcpy (&omask_copy, &omask, sizeof omask); +# else + sigset_t *old_mask_ptr = old_mask; +# endif + + ret = pthread_sigmask (how, new_mask, old_mask_ptr); + # if PTHREAD_SIGMASK_INEFFECTIVE if (ret == 0) { @@ -39,12 +58,16 @@ pthread_sigmask (int how, const sigset_t *new_mask, sigset_t *old_mask) Don't cache the information: libpthread.so could be dynamically loaded after the program started and after pthread_sigmask was called for the first time. */ - if (pthread_sigmask (1729, NULL, NULL) == 0) + if (memcmp (&omask_copy, &omask, sizeof omask) == 0 + && pthread_sigmask (1729, &omask_copy, NULL) == 0) { /* pthread_sigmask is currently ineffective. The program is not linked to -lpthread. So use sigprocmask instead. */ return (sigprocmask (how, new_mask, old_mask) < 0 ? errno : 0); } + + if (old_mask) + memcpy (old_mask, &omask, sizeof omask); } # endif # if PTHREAD_SIGMASK_FAILS_WITH_ERRNO |