[src/trunk]: src/usr.bin/make make(1): extract InitSignals from Compat_Run

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5c6939297200
branches:  trunk
changeset: 979095:5c6939297200
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Dec 13 16:32:57 2020 +0000

description:
make(1): extract InitSignals from Compat_Run

diffstat:

 usr.bin/make/compat.c |  26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diffs (54 lines):

diff -r eb5c34c9bc8c -r 5c6939297200 usr.bin/make/compat.c
--- a/usr.bin/make/compat.c     Sun Dec 13 16:30:08 2020 +0000
+++ b/usr.bin/make/compat.c     Sun Dec 13 16:32:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat.c,v 1.210 2020/12/13 16:30:08 rillig Exp $      */
+/*     $NetBSD: compat.c,v 1.211 2020/12/13 16:32:57 rillig Exp $      */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -96,7 +96,7 @@
 #include "pathnames.h"
 
 /*     "@(#)compat.c   8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: compat.c,v 1.210 2020/12/13 16:30:08 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.211 2020/12/13 16:32:57 rillig Exp $");
 
 static GNode *curTarg = NULL;
 static pid_t compatChild;
@@ -674,6 +674,19 @@
        }
 }
 
+static void
+InitSignals(void)
+{
+       if (bmake_signal(SIGINT, SIG_IGN) != SIG_IGN)
+               bmake_signal(SIGINT, CompatInterrupt);
+       if (bmake_signal(SIGTERM, SIG_IGN) != SIG_IGN)
+               bmake_signal(SIGTERM, CompatInterrupt);
+       if (bmake_signal(SIGHUP, SIG_IGN) != SIG_IGN)
+               bmake_signal(SIGHUP, CompatInterrupt);
+       if (bmake_signal(SIGQUIT, SIG_IGN) != SIG_IGN)
+               bmake_signal(SIGQUIT, CompatInterrupt);
+}
+
 /* Initialize this module and start making.
  *
  * Input:
@@ -688,14 +701,7 @@
        if (!shellName)
                Shell_Init();
 
-       if (bmake_signal(SIGINT, SIG_IGN) != SIG_IGN)
-               bmake_signal(SIGINT, CompatInterrupt);
-       if (bmake_signal(SIGTERM, SIG_IGN) != SIG_IGN)
-               bmake_signal(SIGTERM, CompatInterrupt);
-       if (bmake_signal(SIGHUP, SIG_IGN) != SIG_IGN)
-               bmake_signal(SIGHUP, CompatInterrupt);
-       if (bmake_signal(SIGQUIT, SIG_IGN) != SIG_IGN)
-               bmake_signal(SIGQUIT, CompatInterrupt);
+       InitSignals();
 
        /* Create the .END node now, to keep the (debug) output of the
         * counter.mk test the same as before 2020-09-23.  This implementation