[PATCH] Fix misuse of prefix_path()
- From
Johannes Sixt <j.sixt@viscovery.net>
- Date
- Feb 5, 2008, 08:17 UTC
- Message-ID
- <47A81B9D.3090209@viscovery.net>
- In-Reply-To
- <1202123606.47a6f3567ebb9@webmail.eunet.at>
From: Johannes Sixt <johannes.sixt@telecom.at>
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 <johannes.sixt@telecom.at> --- builtin-init-db.c | 6 +++--- config.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/builtin-init-db.c b/builtin-init-db.c index e1393b8..5d7cdda 100644 --- a/builtin-init-db.c +++ b/builtin-init-db.c @@ -141,9 +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_path(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 526a3f4..498259e 100644 --- a/config.c +++ b/config.c @@ -484,9 +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 = prefix_path(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;
-- 1.5.4.rc5.842.ge7ba5