mirror of
https://github.com/git/git.git
synced 2024-11-27 03:53:55 +08:00
run-command: refactor getting the Unix shell path into its own function
This encapsulates the platform-specific logic better. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
a7dae3bdc8
commit
0593c1ea30
@ -274,17 +274,22 @@ int sane_execvp(const char *file, char * const argv[])
|
||||
return -1;
|
||||
}
|
||||
|
||||
static const char *git_shell_path(void)
|
||||
{
|
||||
#ifndef GIT_WINDOWS_NATIVE
|
||||
return SHELL_PATH;
|
||||
#else
|
||||
return "sh";
|
||||
#endif
|
||||
}
|
||||
|
||||
static const char **prepare_shell_cmd(struct strvec *out, const char **argv)
|
||||
{
|
||||
if (!argv[0])
|
||||
BUG("shell command is empty");
|
||||
|
||||
if (strcspn(argv[0], "|&;<>()$`\\\"' \t\n*?[#~=%") != strlen(argv[0])) {
|
||||
#ifndef GIT_WINDOWS_NATIVE
|
||||
strvec_push(out, SHELL_PATH);
|
||||
#else
|
||||
strvec_push(out, "sh");
|
||||
#endif
|
||||
strvec_push(out, git_shell_path());
|
||||
strvec_push(out, "-c");
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user