global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 18:33:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Turn builtin_exec_path into a function.

Browse Source 
builtin_exec_path returns the hard-coded installation path, which is used
as the ultimate fallback to look for git commands. Making it into a function
enables us to return a computed value instead of just a constant string.
This commit is contained in:
Johannes Sixt
2007-04-11 15:26:08 +02:00
parent 70db4398cd
commit e479ea2f91
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
exec_cmd.c
View File

@@ -5,9 +5,13 @@
#define MAX_ARGS 32
extern char **environ;
static const char *builtin_exec_path = GIT_EXEC_PATH;
static const char *current_exec_path;
static const char *builtin_exec_path(void)
{
return GIT_EXEC_PATH;
}
void git_set_exec_path(const char *exec_path)
{
current_exec_path = exec_path;
@@ -27,7 +31,7 @@ const char *git_exec_path(void)
return env;
}
return builtin_exec_path;
return builtin_exec_path();
}
@@ -37,7 +41,7 @@ int execv_git_cmd(const char **argv)
int i;
const char *paths[] = { current_exec_path,
getenv(EXEC_PATH_ENVIRONMENT),
builtin_exec_path };
builtin_exec_path() };
for (i = 0; i < ARRAY_SIZE(paths); ++i) {
size_t len;
@@ -146,7 +150,7 @@ int spawnv_git_cmd(const char **argv, int pin[2], int pout[2])
pid_t pid;
const char *paths[] = { current_exec_path,
getenv(EXEC_PATH_ENVIRONMENT),
builtin_exec_path };
builtin_exec_path() };
char p[3][PATH_MAX + 1];
char *usedpaths[4], **up = usedpaths;
const char *tmp;