[PATCH 2/7] system_path(): Add prefix computation at runtime if RUNTIME_PREFIX set
- From
Steffen Prohaska <prohaska@zib.de>
- Date
- Aug 17, 2008, 12:44 UTC
- Message-ID
- <1218977083-14526-3-git-send-email-prohaska@zib.de>
- In-Reply-To
- <1218977083-14526-2-git-send-email-prohaska@zib.de>
This commit modifies system_path() to compute the prefix at runtime if explicitly requested to do so. If RUNTIME_PREFIX is defined, system_path() tries to strip known directories that executables can be located in from the path of the executable. If the path is successfully stripped it is used as the prefix.
We print errors if the runtime prefix computation fails. The user needs to know that the global configuration are not picked up, because this can cause unexpected behavior. If a user explicitly wants to ignore system wide paths, he can set GIT_CONFIG_NOSYSTEM, as our tests do.
Signed-off-by: Steffen Prohaska <prohaska@zib.de> --- Makefile | 3 +++ exec_cmd.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile index 9df5a9d..8341558 100644 --- a/Makefile +++ b/Makefile @@ -982,6 +982,9 @@ ifdef INTERNAL_QSORT COMPAT_CFLAGS += -DINTERNAL_QSORT COMPAT_OBJS += compat/qsort.o endif +ifdef RUNTIME_PREFIX + COMPAT_CFLAGS += -DRUNTIME_PREFIX +endif ifdef THREADED_DELTA_SEARCH BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH diff --git a/exec_cmd.c b/exec_cmd.c index ce6741e..1622481 100644 --- a/exec_cmd.c +++ b/exec_cmd.c @@ -9,11 +9,51 @@ static const char *argv0_path; const char *system_path(const char *path) { - if (!is_absolute_path(path) && argv0_path) { - struct strbuf d = STRBUF_INIT; - strbuf_addf(&d, "%s/%s", argv0_path, path); - path = strbuf_detach(&d, NULL); +#ifdef RUNTIME_PREFIX + static const char *prefix; + + if (!argv0_path) { + fprintf(stderr, "RUNTIME_PREFIX requested for path '%s', " + "but argv0_path not set.\n", path); + return path; + } + + if (!prefix) { + const char *strip[] = { + GIT_EXEC_PATH, + BINDIR, + 0 + }; + const char **s; + + for (s = strip; *s; s++) { + const char *sargv = argv0_path + strlen(argv0_path); + const char *ss = *s + strlen(*s); + while (argv0_path < sargv && *s < ss + && (*sargv == *ss || + (is_dir_sep(*sargv) && is_dir_sep(*ss)))) { + sargv--; + ss--; + } + if (*s == ss) { + struct strbuf d = STRBUF_INIT; + strbuf_add(&d, argv0_path, sargv - argv0_path); + prefix = strbuf_detach(&d, NULL); + break; + } + } } + + if (!prefix) { + fprintf(stderr, "RUNTIME_PREFIX requested for path '%s', " + "but prefix computation failed.\n", path); + return path; + } + + struct strbuf d = STRBUF_INIT; + strbuf_addf(&d, "%s/%s", prefix, path); + path = strbuf_detach(&d, NULL); +#endif return path; }
-- 1.6.0.rc3.22.g053fd