Take into account the role of SIGABRT_COMPAT on Windows 2008.

diff --git a/ChangeLog b/ChangeLog
index 4b3429dcdfa7261a6f47f6e38ef1f5eccee5f551..86b9c189e058e7157bff6c3f2712e9b4ec5cb54c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-10-20  Bruno Haible  <bruno@clisp.org>
+
+       Take into account the role of SIGABRT_COMPAT on Windows 2008.
+       * lib/sigprocmask.c (SIGABRT_COMPAT, SIGABRT_COMPAT_MASK): New macros.
+       (sigismember, sigaddset, sigdelset, sigfillset, rpl_signal): Handle it
+       as an alias for SIGABRT.
+       * lib/sigaction.c (SIGABRT_COMPAT): New macro.
+       (sigaction): Map it to SIGABRT.
+       Reported by Ramiro Polla <ramiro.polla@gmail.com> via Eric Blake.
+
 2008-10-20  Bruno Haible  <bruno@clisp.org>
 
        * lib/fts.c: Don't include lstat.h.

diff --git a/lib/sigaction.c b/lib/sigaction.c
index 1bad8092f2795077329db8ed282fbcfca6872805..5fcd3ed9ad6a89f00e7a14c47b8fd67b37a01f1a 100644 (file)
--- a/lib/sigaction.c
+++ b/lib/sigaction.c
@@ -64,6 +64,14 @@
 # define SIGSTOP (-1)
 #endif
 
+/* On native Windows, as of 2008, the signal SIGABRT_COMPAT is an alias
+   for the signal SIGABRT.  Only one signal handler is stored for both
+   SIGABRT and SIGABRT_COMPAT.  SIGABRT_COMPAT is not a signal of its own.  */
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# undef SIGABRT_COMPAT
+# define SIGABRT_COMPAT 6
+#endif
+
 /* A signal handler.  */
 typedef void (*handler_t) (int signal);
 
@@ -134,6 +142,11 @@ sigaction (int sig, const struct sigaction *restrict act,
       return -1;
     }
 
+  #ifdef SIGABRT_COMPAT
+  if (sig == SIGABRT_COMPAT)
+    sig = SIGABRT;
+  #endif
+
   /* POSIX requires sigaction() to be async-signal-safe.  In other
      words, if an asynchronous signal can occur while we are anywhere
      inside this function, the user's handler could then call

diff --git a/lib/sigprocmask.c b/lib/sigprocmask.c
index 7f73f951c1e4bc345974a0075371d3c72a5635d9..7b486a2b04c9490fe9a3031aca7e43ac3c521d9b 100644 (file)
--- a/lib/sigprocmask.c
+++ b/lib/sigprocmask.c
@@ -43,6 +43,19 @@
 # define SIGSTOP (-1)
 #endif
 
+/* On native Windows, as of 2008, the signal SIGABRT_COMPAT is an alias
+   for the signal SIGABRT.  Only one signal handler is stored for both
+   SIGABRT and SIGABRT_COMPAT.  SIGABRT_COMPAT is not a signal of its own.  */
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+# undef SIGABRT_COMPAT
+# define SIGABRT_COMPAT 6
+#endif
+#ifdef SIGABRT_COMPAT
+# define SIGABRT_COMPAT_MASK (1U << SIGABRT_COMPAT)
+#else
+# define SIGABRT_COMPAT_MASK 0
+#endif
+
 typedef void (*handler_t) (int);
 
 /* Handling of gnulib defined signals.  */
@@ -74,7 +87,14 @@ int
 sigismember (const sigset_t *set, int sig)
 {
   if (sig >= 0 && sig < NSIG)
-    return (*set >> sig) & 1;
+    {
+      #ifdef SIGABRT_COMPAT
+      if (sig == SIGABRT_COMPAT)
+       sig = SIGABRT;
+      #endif
+
+      return (*set >> sig) & 1;
+    }
   else
     return 0;
 }
@@ -91,6 +111,11 @@ sigaddset (sigset_t *set, int sig)
 {
   if (sig >= 0 && sig < NSIG)
     {
+      #ifdef SIGABRT_COMPAT
+      if (sig == SIGABRT_COMPAT)
+       sig = SIGABRT;
+      #endif
+
       *set |= 1U << sig;
       return 0;
     }
@@ -106,6 +131,11 @@ sigdelset (sigset_t *set, int sig)
 {
   if (sig >= 0 && sig < NSIG)
     {
+      #ifdef SIGABRT_COMPAT
+      if (sig == SIGABRT_COMPAT)
+       sig = SIGABRT;
+      #endif
+
       *set &= ~(1U << sig);
       return 0;
     }
@@ -116,10 +146,11 @@ sigdelset (sigset_t *set, int sig)
     }
 }
 
+
 int
 sigfillset (sigset_t *set)
 {
-  *set = (2U << (NSIG - 1)) - 1;
+  *set = ((2U << (NSIG - 1)) - 1) & ~ SIGABRT_COMPAT_MASK;
   return 0;
 }
 
@@ -241,6 +272,11 @@ rpl_signal (int sig, handler_t handler)
   if (sig >= 0 && sig < NSIG && sig != SIGKILL && sig != SIGSTOP
       && handler != SIG_ERR)
     {
+      #ifdef SIGABRT_COMPAT
+      if (sig == SIGABRT_COMPAT)
+       sig = SIGABRT;
+      #endif
+
       if (blocked_set & (1U << sig))
        {
          /* POSIX states that sigprocmask and signal are both