From: Sebastian Harl <sh@tokkee.org>
Date: Wed, 27 Feb 2008 20:58:45 +0000 (+0100)
Subject: collectd.c: Check for errors in sigaction().
X-Git-Tag: collectd-4.4.0~87^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=04fd7e422e9ca5ca75d5ffa253cf541d821baa1b;p=collectd.git

collectd.c: Check for errors in sigaction().

Terminate collectd if sigaction() fails which should not happen anyway.

While I was at it, I renamed the signal handler functions and the sigaction
structs to follow the coding style used everywhere else in collectd.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
---

diff --git a/src/collectd.c b/src/collectd.c
index dec7e3f8..d2ca5687 100644
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -52,17 +52,17 @@ static void *do_flush (void *arg)
 	return NULL;
 }
 
-static void sigIntHandler (int signal)
+static void sig_int_handler (int signal)
 {
 	loop++;
 }
 
-static void sigTermHandler (int signal)
+static void sig_term_handler (int signal)
 {
 	loop++;
 }
 
-static void sigUsr1Handler (int signal)
+static void sig_usr1_handler (int signal)
 {
 	pthread_t      thread;
 	pthread_attr_t attr;
@@ -390,9 +390,9 @@ static int pidfile_remove (void)
 
 int main (int argc, char **argv)
 {
-	struct sigaction sigIntAction;
-	struct sigaction sigTermAction;
-	struct sigaction sigUsr1Action;
+	struct sigaction sig_int_action;
+	struct sigaction sig_term_action;
+	struct sigaction sig_usr1_action;
 	char *configfile = CONFIGFILE;
 	int test_config  = 0;
 	const char *basedir;
@@ -537,17 +537,32 @@ int main (int argc, char **argv)
 	/*
 	 * install signal handlers
 	 */
-	memset (&sigIntAction, '\0', sizeof (sigIntAction));
-	sigIntAction.sa_handler = sigIntHandler;
-	sigaction (SIGINT, &sigIntAction, NULL);
+	memset (&sig_int_action, '\0', sizeof (sig_int_action));
+	sig_int_action.sa_handler = sig_int_handler;
+	if (0 != sigaction (SIGINT, &sig_int_action, NULL)) {
+		char errbuf[1024];
+		ERROR ("Error: Failed to install a signal handler for signal INT: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		return (1);
+	}
 
-	memset (&sigTermAction, '\0', sizeof (sigTermAction));
-	sigTermAction.sa_handler = sigTermHandler;
-	sigaction (SIGTERM, &sigTermAction, NULL);
+	memset (&sig_term_action, '\0', sizeof (sig_term_action));
+	sig_term_action.sa_handler = sig_term_handler;
+	if (0 != sigaction (SIGTERM, &sig_term_action, NULL)) {
+		char errbuf[1024];
+		ERROR ("Error: Failed to install a signal handler for signal TERM: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		return (1);
+	}
 
-	memset (&sigUsr1Action, '\0', sizeof (sigUsr1Action));
-	sigUsr1Action.sa_handler = sigUsr1Handler;
-	sigaction (SIGUSR1, &sigUsr1Action, NULL);
+	memset (&sig_usr1_action, '\0', sizeof (sig_usr1_action));
+	sig_usr1_action.sa_handler = sig_usr1_handler;
+	if (0 != sigaction (SIGUSR1, &sig_usr1_action, NULL)) {
+		char errbuf[1024];
+		ERROR ("Error: Failed to install a signal handler for signal USR1: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+		return (1);
+	}
 
 	/*
 	 * run the actual loops