Merge commit 'meins/master'

[paraslash.git] / exec.c

diff --git a/exec.c b/exec.c
index 86362c381fd8b3fe236caeddd4facec88130c901..bafae240260ef386a1adfc77937fad458a27e40b 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -37,7 +37,7 @@ 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 = para_open("/dev/null", O_RDONLY, 42);
+               ret = para_open("/dev/null", O_RDWR, 42);
                if (ret < 0)
                        goto err_out;
                null = ret;
@@ -139,8 +139,6 @@ int para_exec_cmdline_pid(pid_t *pid, const char *cmdline, int *fds)
        char **argv;
        char *tmp = para_strdup(cmdline);
 
-       if (!tmp)
-               exit(EXIT_FAILURE);
        argc = split_args(tmp, &argv, " \t");
        ret = para_exec(pid, argv[0], argv, fds);
        free(argv);