From ef5b9d6e2286630bf8afb5bdf1c6e3356f3d50c7 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Tue, 5 Feb 2008 09:17:33 +0100 Subject: [PATCH] Fix misuse of prefix_path() When DEFAULT_GIT_TEMPLATE_DIR is specified as a relative path, init-db made it relative to exec_path using prefix_path(), which is wrong. prefix_path() is about a file inside the work tree. There was a similar misuse in config.c that takes relative ETC_GITCONFIG path. Noticed by Junio C Hamano. We concatenate the paths manually. (prefix_filename() won't do because it expects a prefix with a trailing '/'.) Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- builtin-init-db.c | 5 +++-- config.c | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin-init-db.c b/builtin-init-db.c index e51d44776..5d7cdda93 100644 --- a/builtin-init-db.c +++ b/builtin-init-db.c @@ -141,8 +141,9 @@ static void copy_templates(const char *git_dir, int len, const char *template_di */ template_dir = DEFAULT_GIT_TEMPLATE_DIR; if (!is_absolute_path(template_dir)) { - const char *exec_path = git_exec_path(); - template_dir = prefix_filename(exec_path, strlen(exec_path), template_dir); + struct strbuf d = STRBUF_INIT; + strbuf_addf(&d, "%s/%s", git_exec_path(), template_dir); + template_dir = strbuf_detach(&d, NULL); } } strcpy(template_path, template_dir); diff --git a/config.c b/config.c index 0b0c9bd05..498259ebe 100644 --- a/config.c +++ b/config.c @@ -484,10 +484,9 @@ const char *git_etc_gitconfig(void) system_wide = ETC_GITCONFIG; if (!is_absolute_path(system_wide)) { /* interpret path relative to exec-dir */ - const char *exec_path = git_exec_path(); - system_wide = strdup(prefix_filename(exec_path, - strlen(exec_path), - system_wide)); + struct strbuf d = STRBUF_INIT; + strbuf_addf(&d, "%s/%s", git_exec_path(), system_wide); + system_wide = strbuf_detach(&d, NULL); } } return system_wide; -- 2.11.0