[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

fatal-signal: Pass the signal number to the action

From: Bruno Haible
Subject: fatal-signal: Pass the signal number to the action
Date: Sat, 16 Mar 2019 23:10:18 +0100
User-agent: KMail/5.1.3 (Linux/4.4.0-141-generic; KDE/5.18.0; x86_64; ; )

Some applications of the 'fatal-signal' modules don't need to know
the signal when executing the cleanup action. But some do. In my case,
I need the cleanup action to print '^C' when the signal is SIGINT.

This patch changes the action type to include the signal number as a
parameter. The change is not backward-compatible, but there are not
many users of 'at_fatal_signal'.

2019-03-16  Bruno Haible  <address@hidden>

        fatal-signal: Pass the signal number to the action.
        * lib/fatal-signal.h (at_fatal_signal): Change the signature.
        * lib/fatal-signal.c (action_t): Take the signal number as parameter.
        (fatal_signal_handler): Pass the signal number to the action.
        * lib/clean-temp.c (cleanup_action): Renamed from cleanup. Take the
        signal number as parameter.
        (create_temp_dir): Update.
        * lib/wait-process.c (cleanup_slaves_action): New function.
        (register_slave_subprocess): Update at_fatal_signal invocation.
        * NEWS: Mention the change.

diff --git a/lib/fatal-signal.h b/lib/fatal-signal.h
index 22680e7..c7d8e35 100644
--- a/lib/fatal-signal.h
+++ b/lib/fatal-signal.h
@@ -51,7 +51,7 @@ extern "C" {
    The cleanup function is executed asynchronously.  It is unspecified
    whether during its execution the catchable fatal signals are blocked
    or not.  */
-extern void at_fatal_signal (void (*function) (void));
+extern void at_fatal_signal (void (*function) (int sig));
 /* Sometimes it is necessary to block the usually fatal signals while the
diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
index 3bf43b0..7f12f12 100644
--- a/lib/fatal-signal.c
+++ b/lib/fatal-signal.c
@@ -107,7 +107,7 @@ init_fatal_signals (void)
 /* ========================================================================= */
-typedef void (*action_t) (void);
+typedef void (*action_t) (int sig);
 /* Type of an entry in the actions array.
    The 'action' field is accessed from within the fatal_signal_handler(),
@@ -162,7 +162,7 @@ fatal_signal_handler (int sig)
       actions_count = n;
       action = actions[n].action;
       /* Execute the action.  */
-      action ();
+      action (sig);
   /* Now execute the signal's default action.
diff --git a/lib/clean-temp.c b/lib/clean-temp.c
index c8d9bb7..0cb4a7e 100644
--- a/lib/clean-temp.c
+++ b/lib/clean-temp.c
@@ -181,7 +181,7 @@ string_hash (const void *x)
 /* The signal handler.  It gets called asynchronously.  */
 static void
-cleanup ()
+cleanup_action (int sig _GL_UNUSED)
   size_t i;
@@ -279,7 +279,7 @@ create_temp_dir (const char *prefix, const char *parentdir,
           if (old_allocated == 0)
             /* First use of this facility.  Register the cleanup handler.  */
-            at_fatal_signal (&cleanup);
+            at_fatal_signal (&cleanup_action);
               /* Don't use memcpy() here, because memcpy takes non-volatile
diff --git a/lib/wait-process.c b/lib/wait-process.c
index 84c0e86..b51e244 100644
--- a/lib/wait-process.c
+++ b/lib/wait-process.c
@@ -102,6 +102,14 @@ cleanup_slaves (void)
+/* The cleanup action, taking a signal argument.
+   It gets called asynchronously.  */
+static void
+cleanup_slaves_action (int sig _GL_UNUSED)
+  cleanup_slaves ();
 /* Register a subprocess as being a slave process.  This means that the
    subprocess will be terminated when its creator receives a catchable fatal
    signal or exits normally.  Registration ends when wait_subprocess()
@@ -113,7 +121,7 @@ register_slave_subprocess (pid_t child)
   if (!cleanup_slaves_registered)
       atexit (cleanup_slaves);
-      at_fatal_signal (cleanup_slaves);
+      at_fatal_signal (cleanup_slaves_action);
       cleanup_slaves_registered = true;
diff --git a/NEWS b/NEWS
index 6127784..77b9f24 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ Important general notes
 Date        Modules         Changes
+2019-03-16  fatal-signal    The function that you pass to at_fatal_signal now
+                            takes the signal as argument.
 2019-02-14  gnulib-tool     If you use multiple --local-dir options at once:
                             The first one now has the highest priority, not the
                             last one.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]