Windows: start_command: Support non-NULL dir in struct child_process

j6t · gitster · commit f9a2743c3529 · 2010-04-11T13:48:46.000-07:00
A caller of start_command can set the member 'dir' to a directory to request that the child process starts with that directory as CWD. The first user of this feature was added recently in eee49b6 (Teach diff --submodule and status to handle .git files in submodules). On Windows, we have been lazy and had not implemented support for this feature, yet. This fixes the shortcoming. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -618,6 +618,7 @@ static int env_compare(const void *a, const void *b)
 }
 
 static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **env,
+			      const char *dir,
 			      int prepend_cmd, int fhin, int fhout, int fherr)
 {
 	STARTUPINFO si;
@@ -697,7 +698,7 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **env,
 
 	memset(&pi, 0, sizeof(pi));
 	ret = CreateProcess(cmd, args.buf, NULL, NULL, TRUE, flags,
-		env ? envblk.buf : NULL, NULL, &si, &pi);
+		env ? envblk.buf : NULL, dir, &si, &pi);
 
 	if (env)
 		strbuf_release(&envblk);
@@ -714,10 +715,11 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **env,
 static pid_t mingw_spawnve(const char *cmd, const char **argv, char **env,
 			   int prepend_cmd)
 {
-	return mingw_spawnve_fd(cmd, argv, env, prepend_cmd, 0, 1, 2);
+	return mingw_spawnve_fd(cmd, argv, env, NULL, prepend_cmd, 0, 1, 2);
 }
 
 pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
+		     const char *dir,
 		     int fhin, int fhout, int fherr)
 {
 	pid_t pid;
@@ -740,14 +742,14 @@ pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
 				pid = -1;
 			}
 			else {
-				pid = mingw_spawnve_fd(iprog, argv, env, 1,
+				pid = mingw_spawnve_fd(iprog, argv, env, dir, 1,
 						       fhin, fhout, fherr);
 				free(iprog);
 			}
 			argv[0] = argv0;
 		}
 		else
-			pid = mingw_spawnve_fd(prog, argv, env, 0,
+			pid = mingw_spawnve_fd(prog, argv, env, dir, 0,
 					       fhin, fhout, fherr);
 		free(prog);
 	}
diff --git a/compat/mingw.h b/compat/mingw.h
@@ -223,6 +223,7 @@ int mingw_utime(const char *file_name, const struct utimbuf *times);
 #define utime mingw_utime
 
 pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
+		     const char *dir,
 		     int fhin, int fhout, int fherr);
 void mingw_execvp(const char *cmd, char *const *argv);
 #define execvp mingw_execvp
diff --git a/run-command.c b/run-command.c
@@ -335,8 +335,6 @@ int start_command(struct child_process *cmd)
 	else if (cmd->out > 1)
 		fhout = dup(cmd->out);
 
-	if (cmd->dir)
-		die("chdir in start_command() not implemented");
 	if (cmd->env)
 		env = make_augmented_environ(cmd->env);
 
@@ -346,7 +344,7 @@ int start_command(struct child_process *cmd)
 		cmd->argv = prepare_shell_cmd(cmd->argv);
 	}
 
-	cmd->pid = mingw_spawnvpe(cmd->argv[0], cmd->argv, env,
+	cmd->pid = mingw_spawnvpe(cmd->argv[0], cmd->argv, env, cmd->dir,
 				  fhin, fhout, fherr);
 	failed_errno = errno;
 	if (cmd->pid < 0 && (!cmd->silent_exec_failure || errno != ENOENT))

Original file line number	Diff line number	Diff line change
`@@ -618,6 +618,7 @@ static int env_compare(const void a, const void b)`
`618`	`618`	`}`
`619`	`619`
`620`	`620`	`static pid_t mingw_spawnve_fd(const char cmd, const char argv, char *env,`
	`621`	`+ const char *dir,`
`621`	`622`	`int prepend_cmd, int fhin, int fhout, int fherr)`
`622`	`623`	`{`
`623`	`624`	`STARTUPINFO si;`
`@@ -697,7 +698,7 @@ static pid_t mingw_spawnve_fd(const char cmd, const char argv, char *env,`
`697`	`698`
`698`	`699`	`memset(&pi, 0, sizeof(pi));`
`699`	`700`	`ret = CreateProcess(cmd, args.buf, NULL, NULL, TRUE, flags,`
`700`		`- env ? envblk.buf : NULL, NULL, &si, &pi);`
	`701`	`+ env ? envblk.buf : NULL, dir, &si, &pi);`
`701`	`702`
`702`	`703`	`if (env)`
`703`	`704`	`strbuf_release(&envblk);`
`@@ -714,10 +715,11 @@ static pid_t mingw_spawnve_fd(const char cmd, const char argv, char *env,`
`714`	`715`	`static pid_t mingw_spawnve(const char cmd, const char argv, char *env,`
`715`	`716`	`int prepend_cmd)`
`716`	`717`	`{`
`717`		`- return mingw_spawnve_fd(cmd, argv, env, prepend_cmd, 0, 1, 2);`
	`718`	`+ return mingw_spawnve_fd(cmd, argv, env, NULL, prepend_cmd, 0, 1, 2);`
`718`	`719`	`}`
`719`	`720`
`720`	`721`	`pid_t mingw_spawnvpe(const char cmd, const char argv, char *env,`
	`722`	`+ const char *dir,`
`721`	`723`	`int fhin, int fhout, int fherr)`
`722`	`724`	`{`
`723`	`725`	`pid_t pid;`
`@@ -740,14 +742,14 @@ pid_t mingw_spawnvpe(const char cmd, const char argv, char *env,`
`740`	`742`	`pid = -1;`
`741`	`743`	`}`
`742`	`744`	`else {`
`743`		`- pid = mingw_spawnve_fd(iprog, argv, env, 1,`
	`745`	`+ pid = mingw_spawnve_fd(iprog, argv, env, dir, 1,`
`744`	`746`	`fhin, fhout, fherr);`
`745`	`747`	`free(iprog);`
`746`	`748`	`}`
`747`	`749`	`argv[0] = argv0;`
`748`	`750`	`}`
`749`	`751`	`else`
`750`		`- pid = mingw_spawnve_fd(prog, argv, env, 0,`
	`752`	`+ pid = mingw_spawnve_fd(prog, argv, env, dir, 0,`
`751`	`753`	`fhin, fhout, fherr);`
`752`	`754`	`free(prog);`
`753`	`755`	`}`