Graceful shutdown for SIGTERM and SIGINT

Author: DeltachangeOG

CRT.c

@@ -951,29 +951,22 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
 
 static bool CRT_retainScreenOnExit = false;
 
+volatile sig_atomic_t terminate_requested = 0;
+volatile sig_atomic_t terminate_signal = 0;
+
 int CRT_scrollHAmount = 5;
 
 int CRT_scrollWheelVAmount = 10;
 
 ColorScheme CRT_colorScheme = COLORSCHEME_DEFAULT;
 
-ATTR_NORETURN
 static void CRT_handleSIGTERM(int sgn) {
-   CRT_done();
-
-   if (!CRT_settings->changed)
-      _exit(0);
-
-   const char* signal_str = strsignal(sgn);
-   if (!signal_str)
-      signal_str = "unknown reason";
+   if (terminate_requested) {
+      _exit(128 + sgn);
+   }
 
-   char err_buf[512];
-   snprintf(err_buf, sizeof(err_buf),
-           "A signal %d (%s) was received, exiting without persisting settings to htoprc.\n",
-           sgn, signal_str);
-   full_write_str(STDERR_FILENO, err_buf);
-   _exit(0);
+   terminate_signal = (sig_atomic_t)sgn;
+   terminate_requested = (sig_atomic_t)1;
 }
 
 #ifndef NDEBUG

CRT.h

@@ -12,6 +12,7 @@ in the source distribution for its full text.
 #include "Macros.h"
 #include "ProvideCurses.h"
 #include "Settings.h"
+#include "signal.h"
 
 
 #define SCREEN_TAB_MARGIN_LEFT 2
@@ -202,6 +203,10 @@ extern int CRT_scrollWheelVAmount;
 
 extern ColorScheme CRT_colorScheme;
 
+extern volatile sig_atomic_t terminate_requested;
+
+extern volatile sig_atomic_t terminate_signal;
+
 #ifdef HAVE_GETMOUSE
 void CRT_setMouse(bool enabled);
 #else

CommandLine.c

@@ -419,6 +419,12 @@ int CommandLine_run(int argc, char** argv) {
 
    CRT_done();
 
+   if (CRT_terminated()) {
+      int sgn = CRT_getSignal();
+      fprintf(stderr, "\nInterrupted by signal %d, terminating.\n", sgn);
+      exit(128 + sgn);
+   }
+
    if (settings->changed) {
 #ifndef NDEBUG
       if (!String_eq(settings->initialFilename, settings->filename))

ScreenManager.c

@@ -257,7 +257,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey, con
 
    this->name = name;
 
-   while (!quit) {
+   while (!quit && !terminate_requested) {
       if (this->header) {
          checkRecalculation(this, &oldTime, &sortTimeout, &redraw, &rescan, &timedOut, &force_redraw);
       }