diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2007-04-11 15:26:08 +0200 |
|---|---|---|
| committer | Johannes Sixt <johannes.sixt@telecom.at> | 2008-06-26 08:45:12 +0200 |
| commit | 4ec22a48c0575c8a303cd00b5ef4b3d703fbf8b3 (patch) | |
| tree | f45fefb4de03a12b29ee0898029138767e51c261 | |
| parent | fc2ded5b08e071beed974117c0148781b1acc94a (diff) | |
| download | git-4ec22a48c0575c8a303cd00b5ef4b3d703fbf8b3.tar.gz | |
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>
| -rw-r--r-- | exec_cmd.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/exec_cmd.c b/exec_cmd.c index a1bc4e04bf..6618aad7ab 100644 --- a/exec_cmd.c +++ b/exec_cmd.c @@ -4,9 +4,13 @@ #define MAX_ARGS 32 extern char **environ; -static const char *builtin_exec_path = GIT_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) { argv_exec_path = exec_path; @@ -26,7 +30,7 @@ const char *git_exec_path(void) return env; } - return builtin_exec_path; + return builtin_exec_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, getenv(EXEC_PATH_ENVIRONMENT)); - add_path(&new_path, builtin_exec_path); + add_path(&new_path, builtin_exec_path()); add_path(&new_path, cmd_path); if (old_path) |