X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectdmon.c;h=61daa58c6ba1f07a4fbfa3716125b3fcb0be73b2;hb=0a8741b9061f8df4a78a448c021612db06e17425;hp=6c50cf12509084f4958958261734bbcd6172ed9f;hpb=3812f29af0b4ae25d1e0114ee0afc4a83880e913;p=collectd.git

diff --git a/src/collectdmon.c b/src/collectdmon.c
index 6c50cf12..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,10 +74,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"
 
@@ -119,6 +128,7 @@ static int pidfile_delete (void)
 static int daemonize (void)
 {
 	struct rlimit rl;
+	int dev_null;
 
 	pid_t pid = 0;
 	int   i   = 0;
@@ -152,26 +162,33 @@ static int daemonize (void)
 	for (i = 0; i < (int)rl.rlim_max; ++i)
 		close (i);
 
-	errno = 0;
-	if (open ("/dev/null", O_RDWR) != 0) {
-		syslog (LOG_ERR, "Error: couldn't connect STDIN to /dev/null: %s",
-				strerror (errno));
+	dev_null = open ("/dev/null", O_RDWR);
+	if (dev_null == -1) {
+		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;
 	}
 
-	errno = 0;
-	if (dup (0) != 1) {
-		syslog (LOG_ERR, "Error: couldn't connect STDOUT to /dev/null: %s",
-				strerror (errno));
+	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;
 	}
 
-	errno = 0;
-	if (dup (0) != 2) {
-		syslog (LOG_ERR, "Error: couldn't connect STDERR to /dev/null: %s",
-				strerror (errno));
+	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;
 	}
+
+	if ((dev_null != STDIN_FILENO) && (dev_null != STDOUT_FILENO) && (dev_null != STDERR_FILENO))
+		close (dev_null);
+
 	return 0;
 } /* daemonize */
 
@@ -317,7 +334,10 @@ int main (int argc, char **argv)
 	openlog ("collectdmon", LOG_CONS | LOG_PID, LOG_DAEMON);
 
 	if (-1 == daemonize ())
+	{
+		free (collectd_argv);
 		return 1;
+	}
 
 	sa.sa_handler = sig_int_term_handler;
 	sa.sa_flags   = 0;
@@ -325,11 +345,13 @@ int main (int argc, char **argv)
 
 	if (0 != sigaction (SIGINT, &sa, NULL)) {
 		syslog (LOG_ERR, "Error: sigaction() failed: %s", strerror (errno));
+		free (collectd_argv);
 		return 1;
 	}
 
 	if (0 != sigaction (SIGTERM, &sa, NULL)) {
 		syslog (LOG_ERR, "Error: sigaction() failed: %s", strerror (errno));
+		free (collectd_argv);
 		return 1;
 	}
 
@@ -337,6 +359,7 @@ int main (int argc, char **argv)
 
 	if (0 != sigaction (SIGHUP, &sa, NULL)) {
 		syslog (LOG_ERR, "Error: sigaction() failed: %s", strerror (errno));
+		free (collectd_argv);
 		return 1;
 	}