X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/aaa245280785370d9ed8424cb6e0a50fd7eb23da..HEAD:/cleanup.c

diff --git a/cleanup.c b/cleanup.c
index 32b997a..97d02c5 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -1,14 +1,26 @@
 /*
  * cleanup.c - Cleanup and shutdown framework.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <signal.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "cleanup.h"
 #include "keydb.h"
@@ -64,17 +76,13 @@ void sig_cleanup(int signal)
  */
 void catchsignals(void)
 {
-	struct sigaction alarmh;
-
 	logthing(LOGTHING_INFO, "Catching signals");
 
-	memset(&alarmh, 0, sizeof(alarmh));
-	alarmh.sa_handler = sig_cleanup;
-	sigaction(SIGALRM, &alarmh, NULL);
-	sigaction(SIGPIPE, &alarmh, NULL);
-	sigaction(SIGTERM, &alarmh, NULL);
-	sigaction(SIGINT, &alarmh, NULL);
-	sigaction(SIGHUP, &alarmh, NULL);
+	signal(SIGALRM, &sig_cleanup);
+	signal(SIGPIPE, &sig_cleanup);
+	signal(SIGTERM, &sig_cleanup);
+	signal(SIGINT, &sig_cleanup);
+	signal(SIGHUP, &sig_cleanup);
 
 	return;
 }