X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectdmon.c;h=61daa58c6ba1f07a4fbfa3716125b3fcb0be73b2;hb=4f9418d694d31137b11100298d8e2c18f717ccb5;hp=a5ed065d5340721cd484d60ebaf62c0a3ef0909d;hpb=9b1ae7f672fd2712b452a58e0682cdea2e34c0f8;p=collectd.git

diff --git a/src/collectdmon.c b/src/collectdmon.c
index a5ed065d..61daa58c 100644
--- a/src/collectdmon.c
+++ b/src/collectdmon.c
@@ -55,6 +55,14 @@
 
 #include <unistd.h>
 
+#ifndef PREFIX
+# define PREFIX "/opt/" PACKAGE_NAME
+#endif
+
+#ifndef LOCALSTATEDIR
+# define LOCALSTATEDIR PREFIX "/var"
+#endif
+
 #ifndef COLLECTDMON_PIDFILE
 # define COLLECTDMON_PIDFILE LOCALSTATEDIR"/run/collectdmon.pid"
 #endif /* ! COLLECTDMON_PIDFILE */
@@ -66,8 +74,8 @@
 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;
 
 __attribute__((noreturn))
 static void exit_usage (const char *name)
@@ -156,21 +164,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;
 	}