mirror of git://git.musl-libc.org/musl
make daemon try the operations that might fail before fork rather than after
This commit is contained in:
parent
19e35c500b
commit
187fe29d5b
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue