From: Rich Felker <dalias@aerifal.cx>
Date: Thu, 17 Feb 2011 15:30:00 +0000 (-0500)
Subject: make daemon try the operations that might fail before fork rather than after
X-Git-Tag: v0.6.0~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=187fe29d5b89644b68cade75a34257a1c32a75f6;p=oweals%2Fmusl.git

make daemon try the operations that might fail before fork rather than after
---

diff --git a/src/linux/daemon.c b/src/linux/daemon.c
index 3750fc34..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,16 +28,5 @@ int daemon(int nochdir, int noclose)
 	default: _exit(0);
 	}
 
-	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;
 }