kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Turn builtin_exec_path into a function. 

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 in a follow-up patch to return a computed value instead of just
a constant string.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
maint
Johannes Sixt 2007-04-11 15:26:08 +02:00
parent fc2ded5b08
commit 4ec22a48c0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
exec_cmd.c
View File

@ -4,9 +4,13 @@
#define MAX_ARGS 32 #define MAX_ARGS 32


extern char **environ; extern char **environ;
static const char *builtin_exec_path = GIT_EXEC_PATH;
static const char *argv_exec_path; static const char *argv_exec_path;


static const char *builtin_exec_path(void)
{
return GIT_EXEC_PATH;
}

void git_set_argv_exec_path(const char *exec_path) void git_set_argv_exec_path(const char *exec_path)
{ {
argv_exec_path = exec_path; argv_exec_path = exec_path;
@ -26,7 +30,7 @@ const char *git_exec_path(void)
return env; return env;
} }


return builtin_exec_path; return builtin_exec_path();
} }


static void add_path(struct strbuf *out, const char *path) static void add_path(struct strbuf *out, const char *path)
@ -50,7 +54,7 @@ void setup_path(const char *cmd_path)


add_path(&new_path, argv_exec_path); add_path(&new_path, argv_exec_path);
add_path(&new_path, getenv(EXEC_PATH_ENVIRONMENT)); add_path(&new_path, getenv(EXEC_PATH_ENVIRONMENT));
add_path(&new_path, builtin_exec_path); add_path(&new_path, builtin_exec_path());
add_path(&new_path, cmd_path); add_path(&new_path, cmd_path);


if (old_path) if (old_path)