Fix relative built-in paths to be relative to the command invocation

[git.git] / exec_cmd.c

diff --git a/exec_cmd.c b/exec_cmd.c
index 8899e31b3b9edb528a339df394f891f76b8de594..45f92eb164f5680c224b2f96f146912224e7b03d 100644 (file)
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -5,6 +5,7 @@
 
 extern char **environ;
 static const char *argv_exec_path;
+static const char *argv0_path;
 
 static const char *builtin_exec_path(void)
 {
@@ -42,14 +43,19 @@ static const char *builtin_exec_path(void)
 
 const char *system_path(const char *path)
 {
-       if (!is_absolute_path(path)) {
+       if (!is_absolute_path(path) && argv0_path) {
                struct strbuf d = STRBUF_INIT;
-               strbuf_addf(&d, "%s/%s", git_exec_path(), path);
+               strbuf_addf(&d, "%s/%s", argv0_path, path);
                path = strbuf_detach(&d, NULL);
        }
        return path;
 }
 
+void git_set_argv0_path(const char *path)
+{
+       argv0_path = path;
+}
+
 void git_set_argv_exec_path(const char *exec_path)
 {
        argv_exec_path = exec_path;
@@ -84,7 +90,7 @@ static void add_path(struct strbuf *out, const char *path)
        }
 }
 
-void setup_path(const char *cmd_path)
+void setup_path(void)
 {
        const char *old_path = getenv("PATH");
        struct strbuf new_path;
@@ -94,7 +100,7 @@ void setup_path(const char *cmd_path)
        add_path(&new_path, argv_exec_path);
        add_path(&new_path, getenv(EXEC_PATH_ENVIRONMENT));
        add_path(&new_path, builtin_exec_path());
-       add_path(&new_path, cmd_path);
+       add_path(&new_path, argv0_path);
 
        if (old_path)
                strbuf_addstr(&new_path, old_path);