You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
81 lines
2.7 KiB
81 lines
2.7 KiB
From 235a2d11dc6982b3a94c45dd57ebafb86ca76734 Mon Sep 17 00:00:00 2001
|
|
From: Martin Briza <mbriza@redhat.com>
|
|
Date: Fri, 27 Jun 2014 14:11:26 +0200
|
|
Subject: [PATCH] Initialize sigactions in signal handlers
|
|
|
|
---
|
|
src/daemon/SignalHandler.cpp | 21 ++++++++++-----------
|
|
1 file changed, 10 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/src/daemon/SignalHandler.cpp b/src/daemon/SignalHandler.cpp
|
|
index 3cc47c7..5c53660 100644
|
|
--- a/src/daemon/SignalHandler.cpp
|
|
+++ b/src/daemon/SignalHandler.cpp
|
|
@@ -60,31 +60,30 @@ namespace SDDM {
|
|
}
|
|
|
|
void SignalHandler::initialize() {
|
|
- struct sigaction sighup;
|
|
+ struct sigaction sighup = { };
|
|
sighup.sa_handler = SignalHandler::hupSignalHandler;
|
|
sigemptyset(&sighup.sa_mask);
|
|
- sighup.sa_flags = 0;
|
|
- sighup.sa_flags |= SA_RESTART;
|
|
+ sighup.sa_flags = SA_RESTART;
|
|
|
|
if (sigaction(SIGHUP, &sighup, 0) > 0) {
|
|
qCritical() << "Failed to setup SIGHUP handler.";
|
|
return;
|
|
}
|
|
|
|
- struct sigaction sigint;
|
|
+ struct sigaction sigint = { };
|
|
sigint.sa_handler = SignalHandler::intSignalHandler;
|
|
sigemptyset(&sigint.sa_mask);
|
|
- sigint.sa_flags |= SA_RESTART;
|
|
+ sigint.sa_flags = SA_RESTART;
|
|
|
|
if (sigaction(SIGINT, &sigint, 0) > 0) {
|
|
qCritical() << "Failed to set up SIGINT handler.";
|
|
return;
|
|
}
|
|
|
|
- struct sigaction sigterm;
|
|
+ struct sigaction sigterm = { };
|
|
sigterm.sa_handler = SignalHandler::termSignalHandler;
|
|
sigemptyset(&sigterm.sa_mask);
|
|
- sigterm.sa_flags |= SA_RESTART;
|
|
+ sigterm.sa_flags = SA_RESTART;
|
|
|
|
if (sigaction(SIGTERM, &sigterm, 0) > 0) {
|
|
qCritical() << "Failed to set up SIGTERM handler.";
|
|
@@ -93,10 +92,10 @@ namespace SDDM {
|
|
}
|
|
|
|
void SignalHandler::initializeSigusr1() {
|
|
- struct sigaction sigusr1;
|
|
+ struct sigaction sigusr1 = { };
|
|
sigusr1.sa_handler = SignalHandler::usr1SignalHandler;
|
|
sigemptyset(&sigusr1.sa_mask);
|
|
- sigusr1.sa_flags |= SA_RESTART;
|
|
+ sigusr1.sa_flags = SA_RESTART;
|
|
|
|
if (sigaction(SIGUSR1, &sigusr1, 0) > 0) {
|
|
qCritical() << "Failed to set up SIGUSR1 handler.";
|
|
@@ -105,10 +104,10 @@ namespace SDDM {
|
|
}
|
|
|
|
void SignalHandler::ignoreSigusr1() {
|
|
- struct sigaction sigusr1;
|
|
+ struct sigaction sigusr1 = { };
|
|
sigusr1.sa_handler = SIG_IGN;
|
|
sigemptyset(&sigusr1.sa_mask);
|
|
- sigusr1.sa_flags |= SA_RESTART;
|
|
+ sigusr1.sa_flags = SA_RESTART;
|
|
|
|
if (sigaction(SIGUSR1, &sigusr1, 0) > 0) {
|
|
qCritical() << "Failed to set up SIGUSR1 handler.";
|
|
--
|
|
1.9.3
|
|
|