From 2de9de5e4ae1353f1552f61cf8cf532e3f1dc5f6 Mon Sep 17 00:00:00 2001 From: Steffen Prohaska Date: Sun, 13 Jul 2008 22:31:18 +0200 Subject: Move code interpreting path relative to exec-dir to new function system_path() Expanding system paths relative to git_exec_path can be used for creating an installation that can be moved to a different directory without re-compiling. We use this approach for template_dir and the system wide gitconfig. The Windows installer (msysgit) is an example for such a setup. This commit moves common code to a new function system_path(). System paths that are to be interpreted relative to git_exec_path are passed to system_path() and the return value is used instead of the original path. system_path() prefixes a relative path with git_exec_path and leaves absolute paths unmodified. For example, we now write template_dir = system_path(DEFAULT_GIT_TEMPLATE_DIR); [j6t: moved from path.c to exec_cmd.c] Signed-off-by: Steffen Prohaska Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- exec_cmd.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'exec_cmd.c') diff --git a/exec_cmd.c b/exec_cmd.c index da04efe951..8899e31b3b 100644 --- a/exec_cmd.c +++ b/exec_cmd.c @@ -40,6 +40,16 @@ static const char *builtin_exec_path(void) #endif } +const char *system_path(const char *path) +{ + if (!is_absolute_path(path)) { + struct strbuf d = STRBUF_INIT; + strbuf_addf(&d, "%s/%s", git_exec_path(), path); + path = strbuf_detach(&d, NULL); + } + return path; +} + void git_set_argv_exec_path(const char *exec_path) { argv_exec_path = exec_path; -- cgit v1.2.1