From be3aa8c9a8bb40cbbaefc2b91ebaee70fc64e4b1 Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Sun, 11 Oct 2020 18:32:11 -0400
Subject: Handle signals before the main loop

This is a long-standing issue I ignored.
---
 bounce.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bounce.c b/bounce.c
index b2764e2..381e334 100644
--- a/bounce.c
+++ b/bounce.c
@@ -68,6 +68,9 @@ static volatile sig_atomic_t signals[NSIG];
 static void signalHandler(int signal) {
 	signals[signal] = 1;
 }
+static void justExit(int signal) {
+	exit(128 + signal);
+}
 
 static struct {
 	struct pollfd *fds;
@@ -350,6 +353,12 @@ int main(int argc, char *argv[]) {
 	if (error) err(EX_OSERR, "pledge");
 #endif
 
+	// Either exit with cleanup or ignore signals until entering the main loop.
+	signal(SIGINT, justExit);
+	signal(SIGTERM, justExit);
+	signal(SIGINFO, SIG_IGN);
+	signal(SIGUSR1, SIG_IGN);
+
 	ringAlloc(ringSize);
 	if (savePath) saveLoad(savePath);
 
-- 
cgit 1.4.1