diff options
Diffstat (limited to 'run-command.h')
| -rw-r--r-- | run-command.h | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/run-command.h b/run-command.h index fb342090e3..850c638f19 100644 --- a/run-command.h +++ b/run-command.h @@ -1,6 +1,10 @@ #ifndef RUN_COMMAND_H #define RUN_COMMAND_H +#ifndef NO_PTHREADS +#include <pthread.h> +#endif + struct child_process { const char **argv; pid_t pid; @@ -18,7 +22,7 @@ struct child_process { * - Specify > 0 to set a channel to a particular FD as follows: * .in: a readable FD, becomes child's stdin * .out: a writable FD, becomes child's stdout/stderr - * .err > 0 not supported + * .err: a writable FD, becomes child's stderr * The specified FD is closed by start_command(), even in case * of errors! */ @@ -33,7 +37,8 @@ struct child_process { unsigned git_cmd:1; /* if this is to be git sub-command */ unsigned silent_exec_failure:1; unsigned stdout_to_stderr:1; - void (*preexec_cb)(void); + unsigned use_shell:1; + unsigned clean_on_exit:1; }; int start_command(struct child_process *); @@ -46,6 +51,8 @@ extern int run_hook(const char *index_file, const char *name, ...); #define RUN_GIT_CMD 2 /*If this is to be git sub-command */ #define RUN_COMMAND_STDOUT_TO_STDERR 4 #define RUN_SILENT_EXEC_FAILURE 8 +#define RUN_USING_SHELL 16 +#define RUN_CLEAN_ON_EXIT 32 int run_command_v_opt(const char **argv, int opt); /* @@ -64,17 +71,20 @@ int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const */ struct async { /* - * proc writes to fd and closes it; + * proc reads from in; closes it before return + * proc writes to out; closes it before return * returns 0 on success, non-zero on failure */ - int (*proc)(int fd, void *data); + int (*proc)(int in, int out, void *data); void *data; + int in; /* caller writes here and closes it */ int out; /* caller reads from here and closes it */ -#ifndef WIN32 +#ifdef NO_PTHREADS pid_t pid; #else - HANDLE tid; - int fd_for_proc; + pthread_t tid; + int proc_in; + int proc_out; #endif }; |