X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=exec.c;h=95bc43e4fae19d9791b36e5e7be2b06b1dc2ebb8;hp=34643b8f61bf94affac5d45987e0389d87a9e9c7;hb=501edee5b98e4133bb64f41f78ffec1cd6f91f7e;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623 diff --git a/exec.c b/exec.c index 34643b8f..95bc43e4 100644 --- a/exec.c +++ b/exec.c @@ -30,23 +30,11 @@ * \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. - * - * In any case, all unneeded filedescriptors are closed. - * * \return Negative on errors, positive on success. * * \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 args[], int *fds) { int ret, in[2] = {-1, -1}, out[2] = {-1, -1}, err[2] = {-1, -1}, null = -1; /* ;) */ @@ -134,39 +122,35 @@ err_out: /** * exec the given command * - * \param pid the same meaning as in para_exec() + * \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 the same meaning as in para_exec() + * \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: * - * 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 /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 */ -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); if (!tmp) exit(EXIT_FAILURE); - argc = split_args(tmp, &argv, ' '); + argc = split_args(tmp, &argv, " \t"); ret = para_exec(pid, argv[0], argv, fds); free(argv); free(tmp); 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); -}