Merge git://repo.or.cz/git-gui

[git.git] / exec_cmd.c

diff --git a/exec_cmd.c b/exec_cmd.c
index c23603452e78f95e738392413a9fefd0ede71e3b..cdd35f91954bdc751455e1083a0612a21eeadc67 100644 (file)
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -50,7 +50,7 @@ static void add_path(struct strbuf *out, const char *path)
                if (is_absolute_path(path))
                        strbuf_addstr(out, path);
                else
-                       strbuf_addstr(out, make_absolute_path(path));
+                       strbuf_addstr(out, make_nonrelative_path(path));
 
                strbuf_addch(out, PATH_SEP);
        }
@@ -59,9 +59,7 @@ static void add_path(struct strbuf *out, const char *path)
 void setup_path(void)
 {
        const char *old_path = getenv("PATH");
-       struct strbuf new_path;
-
-       strbuf_init(&new_path, 0);
+       struct strbuf new_path = STRBUF_INIT;
 
        add_path(&new_path, argv_exec_path);
        add_path(&new_path, getenv(EXEC_PATH_ENVIRONMENT));
@@ -78,7 +76,7 @@ void setup_path(void)
        strbuf_release(&new_path);
 }
 
-int execv_git_cmd(const char **argv)
+const char **prepare_git_cmd(const char **argv)
 {
        int argc;
        const char **nargv;
@@ -91,6 +89,11 @@ int execv_git_cmd(const char **argv)
        for (argc = 0; argv[argc]; argc++)
                nargv[argc + 1] = argv[argc];
        nargv[argc + 1] = NULL;
+       return nargv;
+}
+
+int execv_git_cmd(const char **argv) {
+       const char **nargv = prepare_git_cmd(argv);
        trace_argv_printf(nargv, "trace: exec:");
 
        /* execvp() can only ever return if it fails */