X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Flinux%2Fdaemon.c;h=afb8019f055d193b809366b80f07962bfb2bfab3;hb=7683fceedebd98dda19b1a379b92406b64ce7f92;hp=632d1203debf329148d135ff71ac10c237815da3;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/linux/daemon.c b/src/linux/daemon.c
index 632d1203..afb8019f 100644
--- a/src/linux/daemon.c
+++ b/src/linux/daemon.c
@@ -3,7 +3,16 @@
 
 int daemon(int nochdir, int noclose)
 {
-	int fd;
+	if (!nochdir && chdir("/"))
+		return -1;
+	if (!noclose) {
+		int fd, 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;
+	}
 
 	switch(fork()) {
 	case 0: break;
@@ -19,13 +28,5 @@ 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 (fd > 2) close(fd);
-	}
-
 	return 0;
 }