From 2cf5a3bb6d6616f26d0a65a9b939595ce74b875d Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Fri, 22 Jan 2016 09:04:41 +0100 Subject: [PATCH] collectdmon: Refactor the re-opening of STD{IN,OUT,ERR}. --- src/collectdmon.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/collectdmon.c b/src/collectdmon.c index f2798eef..65271ddd 100644 --- a/src/collectdmon.c +++ b/src/collectdmon.c @@ -119,7 +119,7 @@ static int pidfile_delete (void) static int daemonize (void) { struct rlimit rl; - int status; + int dev_null; pid_t pid = 0; int i = 0; @@ -153,29 +153,30 @@ static int daemonize (void) for (i = 0; i < (int)rl.rlim_max; ++i) close (i); - errno = 0; - status = open ("/dev/null", O_RDWR); - if (status != 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; - status = dup (0); - if (status != 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; - status = dup (0); - if (status != 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 */ -- 2.11.0