From a4986a17cbcfd08b18264a683c123442536f4822 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Mon, 7 Dec 2020 18:03:24 -0800 Subject: [PATCH] Update Debug.cc to use setsignal() wrapper So as to prefer sigaction() over either sigset() or signal(), which are less favorable due to underspecification issues and some treating them as obsolete/deprecated. --- src/Debug.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Debug.cc b/src/Debug.cc index 0c04763fa5..f11cb5b652 100644 --- a/src/Debug.cc +++ b/src/Debug.cc @@ -34,6 +34,10 @@ #include "zeek/module_util.h" #include "zeek/input.h" +extern "C" { +#include "zeek/setsignal.h" +} + using namespace std; bool zeek::detail::g_policy_debug = false; @@ -477,8 +481,8 @@ int dbg_init_debugger(const char* cmdfile) init_readline(); #endif - signal(SIGINT, &break_signal); - signal(SIGTERM, break_signal); + setsignal(SIGINT, break_signal); + setsignal(SIGTERM, break_signal); return 1; } @@ -858,8 +862,8 @@ int dbg_handle_debug_input() g_debugger_state.curr_frame_idx = 0; g_debugger_state.already_did_list = false; - signal(SIGINT, &break_signal); - signal(SIGTERM, &break_signal); + setsignal(SIGINT, break_signal); + setsignal(SIGTERM, break_signal); return 0; }