X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=exec.c;h=e765dc4d8f0473290b309efd45e04318b21b6792;hp=42a183a435e29cd764faf867a5804b1ea90f96fd;hb=8aa0f575bcca12ab63ab53141c2144448c457478;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf;ds=sidebyside

diff --git a/exec.c b/exec.c
index 42a183a4..e765dc4d 100644
--- a/exec.c
+++ b/exec.c
@@ -1,28 +1,32 @@
 /*
- * Copyright (C) 2003-2006 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 */
+/** \file exec.c Helper functions for spawning new processes. */
+
+#include <regex.h>
+
 #include "para.h"
 #include "close_on_fork.h"
 #include "error.h"
+#include "fd.h"
 #include "string.h"
 
 /**
- * spawn a new process and redirect fd 0, 1, and 2
+ * Spawn a new process and redirect fd 0, 1, and 2.
  *
- * \param pid will hold the pid of the created process upon return
- * \param file path of the executable to execute
- * \param args the argument array for the command
- * \param fds a pointer to a value-result array
+ * \param pid Will hold the pid of the created process upon return.
+ * \param file Path of the executable to execute.
+ * \param args The argument array for the command.
+ * \param fds a Pointer to a value-result array.
  *
- * \return Negative on errors, positive on success.
+ * \return Standard.
  *
- * \sa null(4), pipe(2), dup2(2), fork(2), exec(3)
+ * \sa null(4), pipe(2), dup2(2), fork(2), exec(3).
  */
-static int para_exec(pid_t *pid, const char *file, char *const args[], int *fds)
+static int para_exec(pid_t *pid, const char *file, char *const *const args, int *fds)
 {
 	int ret, in[2] = {-1, -1}, out[2] = {-1, -1}, err[2] = {-1, -1},
 		null = -1; /* ;) */
@@ -35,15 +39,18 @@ static int para_exec(pid_t *pid, const char *file, char *const args[], int *fds)
 	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;
+	}
+	ret = fork();
+	if (ret < 0) {
+		ret = -ERRNO_TO_PARA_ERROR(errno);
+		goto err_out;
 	}
-	if ((*pid = fork()) < 0)
-		exit(EXIT_FAILURE);
+	*pid = ret;
 	if (!(*pid)) { /* child */
-		close_listed_fds(); /* close unneeded fds */
 		if (fds[0] >= 0) {
 			if (fds[0]) {
 				close(in[1]);
@@ -103,42 +110,40 @@ err_out:
 		close(in[1]);
 	if (null >= 0)
 		close(null);
+	PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	return ret;
 }
 
-
 /**
- * exec the given command
+ * Exec the given command.
  *
- * \param pid will hold the pid of the created process upon return
- * \param cmdline holds the command and its arguments, seperated by spaces
- * \param fds a pointer to a value-result array
+ * \param pid Will hold the pid of the created process upon return.
+ * \param cmdline Holds the command and its arguments, seperated by spaces.
+ * \param fds A pointer to a value-result array.
  *
  * This function uses fork/exec to create a new process. \a fds must be a
  * pointer to three integers, corresponding to stdin, stdout and stderr
  * respectively. It specifies how to deal with fd 0, 1, 2 in the child. The
  * contents of \a fds are interpreted as follows:
  *
- *	- fd[i] < 0: leave fd \a i alone
- *	- fd[i] = 0: dup fd \a i to /dev/null
+ *	- fd[i] < 0: leave fd \a i alone.
+ *	- fd[i] = 0: dup fd \a i to \p /dev/null.
  *	- fd[i] > 0: create a pipe and dup i to one end of that pipe.
  *	Upon return, fd[i] contains the file descriptor of the pipe.
  *
  * 	In any case, all unneeded filedescriptors are closed.
  *
- * \return positive on success, negative on errors
+ * \return Standard.
  */
 int para_exec_cmdline_pid(pid_t *pid, const char *cmdline, int *fds)
 {
-	int argc, ret;
-	char **argv, *tmp = para_strdup(cmdline);
+	int ret;
+	char **argv;
 
-	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;
 }
-