X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=exec.c;fp=exec.c;h=da7a3568ced41c0b2dc886bcffaa5793f7ca8fd1;hp=bbf1b41addf8aab65363065c9e3b6ad91cae4968;hb=93ea9f34dcb35755568e6c94f9b9445fd4d1984a;hpb=f18341c277abf63dae1598b76cdd207006a509e0 diff --git a/exec.c b/exec.c index bbf1b41a..da7a3568 100644 --- a/exec.c +++ b/exec.c @@ -5,10 +5,12 @@ */ /** \file exec.c Helper functions for spawning new processes. */ +#include #include "para.h" #include "close_on_fork.h" #include "error.h" #include "string.h" +#include "fd.h" /** * Spawn a new process and redirect fd 0, 1, and 2. @@ -35,13 +37,17 @@ static int para_exec(pid_t *pid, const char *file, char *const *const args, int if (fds[2] > 0 && pipe(err) < 0) goto err_out; if (!fds[0] || !fds[1] || !fds[2]) { - ret = -E_NULL_OPEN; - null = open("/dev/null", O_RDONLY); - if (null < 0) + ret = para_open("/dev/null", O_RDONLY, 42); + if (ret < 0) goto err_out; + null = ret; } - if ((*pid = fork()) < 0) - exit(EXIT_FAILURE); + ret = fork(); + if (ret < 0) { + ret = -ERRNO_TO_PARA_ERROR(errno); + goto err_out; + } + *pid = ret; if (!(*pid)) { /* child */ close_listed_fds(); /* close unneeded fds */ if (fds[0] >= 0) { @@ -103,6 +109,7 @@ err_out: close(in[1]); if (null >= 0) close(null); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); return ret; }