From 19e35c500bd2b5e6146e42705ab9b69c155a2006 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 17 Feb 2011 10:28:56 -0500 Subject: [PATCH] daemon should check for failures and return -1 --- src/linux/daemon.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/linux/daemon.c b/src/linux/daemon.c index 632d1203..3750fc34 100644 --- a/src/linux/daemon.c +++ b/src/linux/daemon.c @@ -19,12 +19,15 @@ int daemon(int nochdir, int noclose) default: _exit(0); } - if (!nochdir) chdir("/"); - if (!noclose && (fd = open("/dev/null", O_RDWR)) >= 0) { - dup2(fd, 0); - dup2(fd, 1); - dup2(fd, 2); + if (!nochdir && chdir("/")) + return -1; + if (!noclose) { + int failed = 0; + if ((fd = open("/dev/null", O_RDWR)) < 0) return -1; + if (dup2(fd, 0) < 0 || dup2(fd, 1) < 0 || dup2(fd, 2) < 0) + failed++; if (fd > 2) close(fd); + if (failed) return -1; } return 0; -- 2.20.1