/*
- * Copyright (C) 2003-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2003-2009 Andre Noll <maan@systemlinux.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * 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 <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
- *
- * \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
- *
- * 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: create a pipe and dup i to one end of that pipe.
- * Upon return, fd[i] contains the file descriptor of the pipe.
+ * Spawn a new process and redirect fd 0, 1, and 2.
*
- * In any case, all unneeded filedescriptors are closed.
+ * \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).
*/
-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; /* ;) */
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]);
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 the same meaning as in para_exec()
- * \param cmdline holds the command and its arguments, seperated by spaces
- * \param fds the same meaning as in para_exec()
+ * 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:
*
- * A wrapper for para_exec() which calls split_args() to seperate
- * the command line arguments.
+ * - 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.
*
- * \return positive on success, negative on errors
+ * In any case, all unneeded filedescriptors are closed.
+ *
+ * \return Standard.
*/
-int para_exec_cmdline_pid(pid_t *pid, char *cmdline, int *fds)
+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, ' ');
+ 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;
}
-
-/**
- * check whether a file exists
- *
- * \param fn the file name
- *
- * \return Non-zero iff file exists.
- */
-int file_exists(const char *fn)
-{
- struct stat statbuf;
-
- return !stat(fn, &statbuf);
-}
projects / paraslash.git / blobdiff