mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

run-command: refactor getting the Unix shell path into its own function

Browse Source 
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:
Johannes Schindelin
2024-07-13 21:08:18 +00:00
committed by Junio C Hamano
parent a7dae3bdc8
commit 0593c1ea30
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
run-command.c
View File

@ -274,17 +274,22 @@ int sane_execvp(const char *file, char * const argv[])
return -1; 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) static const char **prepare_shell_cmd(struct strvec *out, const char **argv)
{ {
if (!argv[0]) if (!argv[0])
BUG("shell command is empty"); BUG("shell command is empty");
if (strcspn(argv[0], "|&;<>()$`\\\"' \t\n*?[#~=%") != strlen(argv[0])) { if (strcspn(argv[0], "|&;<>()$`\\\"' \t\n*?[#~=%") != strlen(argv[0])) {
#ifndef GIT_WINDOWS_NATIVE strvec_push(out, git_shell_path());
strvec_push(out, SHELL_PATH);
#else
strvec_push(out, "sh");
#endif
strvec_push(out, "-c"); strvec_push(out, "-c");
/* /*