/*
- * Copyright (C) 2003-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2003-2013 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 <regex.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.
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;
}
*pid = ret;
if (!(*pid)) { /* child */
- close_listed_fds(); /* close unneeded fds */
if (fds[0] >= 0) {
if (fds[0]) {
close(in[1]);
*/
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;
}