X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectdmon.c;h=65271ddd3f424db9c3050979de59e70b328f7483;hb=1917116cda67eb6d90f68d0b39a930d90cee416e;hp=33f02b45694d889d07613a05110230c1b32d7442;hpb=c21ce3b44f63d706b8b200a88047db74f1a51392;p=collectd.git

diff --git a/src/collectdmon.c b/src/collectdmon.c
index 33f02b45..65271ddd 100644
--- a/src/collectdmon.c
+++ b/src/collectdmon.c
@@ -119,6 +119,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 +153,30 @@ 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 failed to open /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, STDIN_FILENO) == -1) {
+		syslog (LOG_ERR, "Error: couldn't connect STDIN 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, STDOUT_FILENO) == -1) {
+		syslog (LOG_ERR, "Error: couldn't connect STDOUT to /dev/null: %s", strerror (errno));
 		return -1;
 	}
+
+	if (dup2 (dev_null, STDERR_FILENO) == -1) {
+		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 */