X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectdmon.c;h=13304f2a18075d2333c98c7daae66b64db8e766f;hb=5007fb256b4abbef2dbc675f9a15273554a3385e;hp=65271ddd3f424db9c3050979de59e70b328f7483;hpb=6164fe4456716e6dc36aaa2ab617b104a7ac5ff3;p=collectd.git

diff --git a/src/collectdmon.c b/src/collectdmon.c
index 65271ddd..13304f2a 100644
--- a/src/collectdmon.c
+++ b/src/collectdmon.c
@@ -66,10 +66,11 @@
 static int loop    = 0;
 static int restart = 0;
 
-static char  *pidfile      = NULL;
-static pid_t  collectd_pid = 0;
+static const char *pidfile      = NULL;
+static pid_t       collectd_pid = 0;
 
-static void exit_usage (char *name)
+__attribute__((noreturn))
+static void exit_usage (const char *name)
 {
 	printf ("Usage: %s <options> [-- <collectd options>]\n"
 
@@ -155,21 +156,24 @@ static int daemonize (void)
 
 	dev_null = open ("/dev/null", O_RDWR);
 	if (dev_null == -1) {
-		syslog (LOG_ERR, "Error: couldn't failed to open /dev/null: %s", strerror (errno));
+		syslog (LOG_ERR, "Error: couldn't open /dev/null: %s", strerror (errno));
 		return -1;
 	}
 
 	if (dup2 (dev_null, STDIN_FILENO) == -1) {
+		close (dev_null);
 		syslog (LOG_ERR, "Error: couldn't connect STDIN to /dev/null: %s", strerror (errno));
 		return -1;
 	}
 
 	if (dup2 (dev_null, STDOUT_FILENO) == -1) {
+		close (dev_null);
 		syslog (LOG_ERR, "Error: couldn't connect STDOUT to /dev/null: %s", strerror (errno));
 		return -1;
 	}
 
 	if (dup2 (dev_null, STDERR_FILENO) == -1) {
+		close (dev_null);
 		syslog (LOG_ERR, "Error: couldn't connect STDERR to /dev/null: %s", strerror (errno));
 		return -1;
 	}