daemon should check for failures and return -1

19e35c50 · Rich Felker · b24bc15f · 19e35c50
显示空白变更内容
内联并排

Showing with 8 addition and 5 deletion

src/linux/daemon.c src/linux/daemon.c +8 -5

未找到文件。
--- 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 (!nochdir && chdir("/"))
-	if (!noclose && (fd = open("/dev/null", O_RDWR)) >= 0) {
+		return -1;
-		dup2(fd, 0);
+	if (!noclose) {
-		dup2(fd, 1);
+		int failed = 0;
-		dup2(fd, 2);
+		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;