Remove an overambitious sanity check in the fecdec filter.

[paraslash.git] / exec.c

diff --git a/exec.c b/exec.c
index bbf1b41addf8aab65363065c9e3b6ad91cae4968..86a483cfd8e704eda8907d7399e891f603633393 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -1,14 +1,16 @@
 /*
- * Copyright (C) 2003-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2003-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file exec.c Helper functions for spawning new processes. */
+#include <dirent.h>
 #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,15 +37,18 @@ 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_RDWR, 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) {
                        if (fds[0]) {
                                close(in[1]);
@@ -103,6 +108,7 @@ err_out:
                close(in[1]);
        if (null >= 0)
                close(null);
+       PARA_ERROR_LOG("%s\n", para_strerror(-ret));
        return ret;
 }
 
@@ -129,13 +135,11 @@ err_out:
  */
 int para_exec_cmdline_pid(pid_t *pid, const char *cmdline, int *fds)
 {
-       int argc, ret;
+       int ret;
        char **argv;
        char *tmp = para_strdup(cmdline);
 
-       if (!tmp)
-               exit(EXIT_FAILURE);
-       argc = split_args(tmp, &argv, " \t");
+       split_args(tmp, &argv, " \t");
        ret = para_exec(pid, argv[0], argv, fds);
        free(argv);
        free(tmp);