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 <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-init-db.c b/builtin-init-db.c
index e51d4477616b463fd14fc17dc40ed7f22f25de0c..5d7cdda93314b1d40f5f512897e8a35af0480a8f 100644 (file)
--- 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)) {
                 */
                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);
                }
        }
        strcpy(template_path, template_dir);

diff --git a/config.c b/config.c
index 0b0c9bd050023e15d3f49623ea036894cb5c521a..498259ebefb3ba61a75aa5a5ca03d75576a501c0 100644 (file)
--- 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 */
                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;
                }
        }
        return system_wide;