X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=exec.c;h=b11b217b963fd2359622d5f56688c7f51e80b766;hp=da7a3568ced41c0b2dc886bcffaa5793f7ca8fd1;hb=d09716570fc81b71d6ad3d5f543b5f8acf1a5e33;hpb=93ea9f34dcb35755568e6c94f9b9445fd4d1984a

diff --git a/exec.c b/exec.c
index da7a3568..b11b217b 100644
--- a/exec.c
+++ b/exec.c
@@ -1,16 +1,19 @@
 /*
- * Copyright (C) 2003-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2003-2011 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 <regex.h>
 #include <dirent.h>
+
 #include "para.h"
 #include "close_on_fork.h"
 #include "error.h"
-#include "string.h"
 #include "fd.h"
+#include "string.h"
 
 /**
  * Spawn a new process and redirect fd 0, 1, and 2.
@@ -37,7 +40,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;
@@ -49,7 +52,6 @@ static int para_exec(pid_t *pid, const char *file, char *const *const args, int
 	}
 	*pid = ret;
 	if (!(*pid)) { /* child */
-		close_listed_fds(); /* close unneeded fds */
 		if (fds[0] >= 0) {
 			if (fds[0]) {
 				close(in[1]);
@@ -136,15 +138,13 @@ 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");
+	ret = create_argv(cmdline, " \t", &argv);
+	if (ret < 0)
+		return ret;
 	ret = para_exec(pid, argv[0], argv, fds);
-	free(argv);
-	free(tmp);
+	free_argv(argv);
 	return ret;
 }