about summary refs log tree commit diff
path: root/src/linux
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-02-17 10:28:56 -0500
committerRich Felker <dalias@aerifal.cx>2011-02-17 10:28:56 -0500
commit19e35c500bd2b5e6146e42705ab9b69c155a2006 (patch)
treeec36d9d90ba2a3d323fc7a092fac9ce48a2f0a86 /src/linux
parentb24bc15f5c3828184f123698b4b545fef4edac99 (diff)
downloadmusl-19e35c500bd2b5e6146e42705ab9b69c155a2006.tar.gz
musl-19e35c500bd2b5e6146e42705ab9b69c155a2006.tar.xz
musl-19e35c500bd2b5e6146e42705ab9b69c155a2006.zip
daemon should check for failures and return -1
Diffstat (limited to 'src/linux')
-rw-r--r--src/linux/daemon.c13
1 files 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;