X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=run-command.h;h=1fc781d7668468f9e74bd430b7569dc040440ba8;hb=92b7ba16b7605f70cac845d4a8d0162392ac0223;hp=3680ef9d452490c67788b0ab027839a8383ed855;hpb=1b2782a5e2f88bf5e6e2cbb58e54fea015e21af5;p=git.git

diff --git a/run-command.h b/run-command.h
index 3680ef9d4..1fc781d76 100644
--- a/run-command.h
+++ b/run-command.h
@@ -16,10 +16,14 @@ struct child_process {
 	pid_t pid;
 	int in;
 	int out;
+	int err;
+	const char *dir;
+	const char *const *env;
 	unsigned close_in:1;
 	unsigned close_out:1;
 	unsigned no_stdin:1;
 	unsigned no_stdout:1;
+	unsigned no_stderr:1;
 	unsigned git_cmd:1; /* if this is to be git sub-command */
 	unsigned stdout_to_stderr:1;
 };
@@ -32,5 +36,34 @@ int run_command(struct child_process *);
 #define RUN_GIT_CMD	     2	/*If this is to be git sub-command */
 #define RUN_COMMAND_STDOUT_TO_STDERR 4
 int run_command_v_opt(const char **argv, int opt);
+int run_command_v_opt_cd(const char **argv, int opt, const char *dir);
+
+/*
+ * env (the environment) is to be formatted like environ: "VAR=VALUE".
+ * To unset an environment variable use just "VAR".
+ */
+int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const char *const *env);
+
+/*
+ * The purpose of the following functions is to feed a pipe by running
+ * a function asynchronously and providing output that the caller reads.
+ *
+ * It is expected that no synchronization and mutual exclusion between
+ * the caller and the feed function is necessary so that the function
+ * can run in a thread without interfering with the caller.
+ */
+struct async {
+	/*
+	 * proc writes to fd and closes it;
+	 * returns 0 on success, non-zero on failure
+	 */
+	int (*proc)(int fd, void *data);
+	void *data;
+	int out;	/* caller reads from here and closes it */
+	pid_t pid;
+};
+
+int start_async(struct async *async);
+int finish_async(struct async *async);
 
 #endif