From: est31 <MTest31@outlook.com>
Date: Fri, 24 Jun 2016 18:43:29 +0000 (+0200)
Subject: Also shut down when SIGTERM was received
X-Git-Tag: 0.4.15~344
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ab7a5c4ff138c39a2491592731d677c9f392caa0;p=oweals%2Fminetest.git

Also shut down when SIGTERM was received

Fixes #4251
---

diff --git a/src/porting.cpp b/src/porting.cpp
index 98b85b7d0..7ded58b3f 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -75,11 +75,16 @@ bool * signal_handler_killstatus(void)
 #if !defined(_WIN32) // POSIX
 	#include <signal.h>
 
-void sigint_handler(int sig)
+void signal_handler(int sig)
 {
 	if (!g_killed) {
-		dstream << "INFO: sigint_handler(): "
-			<< "Ctrl-C pressed, shutting down." << std::endl;
+		if (sig == SIGINT) {
+			dstream << "INFO: signal_handler(): "
+				<< "Ctrl-C pressed, shutting down." << std::endl;
+		} else if (sig == SIGTERM) {
+			dstream << "INFO: signal_handler(): "
+				<< "got SIGTERM, shutting down." << std::endl;
+		}
 
 		// Comment out for less clutter when testing scripts
 		/*dstream << "INFO: sigint_handler(): "
@@ -88,13 +93,14 @@ void sigint_handler(int sig)
 
 		g_killed = true;
 	} else {
-		(void)signal(SIGINT, SIG_DFL);
+		(void)signal(sig, SIG_DFL);
 	}
 }
 
 void signal_handler_init(void)
 {
-	(void)signal(SIGINT, sigint_handler);
+	(void)signal(SIGINT, signal_handler);
+	(void)signal(SIGTERM, signal_handler);
 }
 
 #else // _WIN32