Use raise module consistently.

* modules/fatal-signal (Depends-on): Add raise.
* modules/sigprocmask (Depends-on): Likewise.
* lib/fatal-signal.c (fatal_signal_handler): Rely on raise.
* lib/sigprocmask.c (sigprocmask): Likewise.
* m4/fatal-signal.m4 (gl_FATAL_SIGNAL): Likewise.
* m4/signalblocking.m4 (gl_PREREQ_SIGPROCMASK): Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 054cec07f5bed02a4d6ffe7c0450641f72efcb8a..0976ec37a28520a355bb6d32a2bb896bbcd11f0f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-06-16  Eric Blake  <ebb9@byu.net>
 
+       Use raise module consistently.
+       * modules/fatal-signal (Depends-on): Add raise.
+       * modules/sigprocmask (Depends-on): Likewise.
+       * lib/fatal-signal.c (fatal_signal_handler): Rely on raise.
+       * lib/sigprocmask.c (sigprocmask): Likewise.
+       * m4/fatal-signal.m4 (gl_FATAL_SIGNAL): Likewise.
+       * m4/signalblocking.m4 (gl_PREREQ_SIGPROCMASK): Likewise.
+
        Fix compliance bug in sigpending.
        * lib/sigprocmask.c (sigpending): Return pending array via
        parameter, not return value.

diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
index 5157d7c540f3c5bf235bfd12b3c2fa4916795741..a599f3a5c811c8026e938211bf0327d84cd944ac 100644 (file)
--- a/lib/fatal-signal.c
+++ b/lib/fatal-signal.c
@@ -1,5 +1,5 @@
 /* Emergency actions in case of a fatal signal.
-   Copyright (C) 2003-2004, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2003-2004, 2006-2008 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -162,11 +162,7 @@ fatal_signal_handler (int sig)
      signal handler's execution, the re-raised signal is delivered when this
      handler returns; otherwise it is delivered already during raise().  */
   uninstall_handlers ();
-#if HAVE_RAISE
   raise (sig);
-#else
-  kill (getpid (), sig);
-#endif
 }
 
 

diff --git a/lib/sigprocmask.c b/lib/sigprocmask.c
index e2f6d8bd97a0d6299036da03b01a7c723b024a39..bc9eae723f2c35cf98ddcc5850e77adaaabc1ac4 100644 (file)
--- a/lib/sigprocmask.c
+++ b/lib/sigprocmask.c
@@ -179,13 +179,7 @@ sigprocmask (int operation, const sigset_t *set, sigset_t *old_set)
 
          for (sig = 0; sig < NSIG; sig++)
            if (received[sig])
-             {
-               #if HAVE_RAISE
-               raise (sig);
-               #else
-               kill (getpid (), sig);
-               #endif
-             }
+              raise (sig);
        }
     }
   return 0;

diff --git a/m4/fatal-signal.m4 b/m4/fatal-signal.m4
index c188b14395887275b381faedd0f1b3981c1f1868..1930e0a2e7a4a507bf243b1ee64ccba9c17ae9ff 100644 (file)
--- a/m4/fatal-signal.m4
+++ b/m4/fatal-signal.m4
@@ -1,5 +1,5 @@
-# fatal-signal.m4 serial 4
-dnl Copyright (C) 2003-2004, 2006 Free Software Foundation, Inc.
+# fatal-signal.m4 serial 5
+dnl Copyright (C) 2003-2004, 2006, 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,6 +8,5 @@ AC_DEFUN([gl_FATAL_SIGNAL],
 [
   AC_REQUIRE([gt_TYPE_SIG_ATOMIC_T])
   AC_CHECK_HEADERS_ONCE(unistd.h)
-  AC_CHECK_FUNCS_ONCE(raise)
   AC_CHECK_FUNCS(sigaction)
 ])

diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4
index 199f29b36f4f104d64f40d6cd9c12977e676a5eb..38f066d37990dab874df9018017eb54d0951c94a 100644 (file)
--- a/m4/signalblocking.m4
+++ b/m4/signalblocking.m4
@@ -1,5 +1,5 @@
-# signalblocking.m4 serial 6
-dnl Copyright (C) 2001-2002, 2006-2007 Free Software Foundation, Inc.
+# signalblocking.m4 serial 7
+dnl Copyright (C) 2001-2002, 2006-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -39,5 +39,4 @@ AC_DEFUN([gl_PREREQ_SIGPROCMASK],
   dnl HAVE_SIGSET_T is 1 if the system lacks the sigprocmask function but has
   dnl the sigset_t type.
   AC_SUBST([HAVE_SIGSET_T])
-  AC_CHECK_FUNCS_ONCE(raise)
 ])

diff --git a/modules/fatal-signal b/modules/fatal-signal
index 4365b3a61e2f0d7f787c88cf07c7d0f409eaf4ea..8e8eb8a6dc58732dd27a41f2c21cdeba41f5d83c 100644 (file)
--- a/modules/fatal-signal
+++ b/modules/fatal-signal
@@ -12,6 +12,7 @@ xalloc
 stdbool
 unistd
 sigprocmask
+raise
 
 configure.ac:
 gl_FATAL_SIGNAL

diff --git a/modules/sigprocmask b/modules/sigprocmask
index 49e4fbbafaeb977126de709194259b947071929c..e0931120386803826ed12878ba030a4e40e55f44 100644 (file)
--- a/modules/sigprocmask
+++ b/modules/sigprocmask
@@ -8,6 +8,7 @@ m4/signalblocking.m4
 Depends-on:
 signal
 stdint
+raise
 
 configure.ac:
 gl_SIGNALBLOCKING