Refactor git_set_argv0_path() to git_extract_argv0_path()

[git/git.git] / exec_cmd.c

diff --git a/exec_cmd.c b/exec_cmd.c
index 114d638..e508f1e 100644 (file)
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -20,9 +20,19 @@ const char *system_path(const char *path)
        return path;
 }
 
-void git_set_argv0_path(const char *path)
+const char *git_extract_argv0_path(const char *argv0)
 {
-       argv0_path = path;
+       const char *slash = argv0 + strlen(argv0);
+
+       while (argv0 <= slash && !is_dir_sep(*slash))
+               slash--;
+
+       if (slash >= argv0) {
+               argv0_path = xstrndup(argv0, slash - argv0);
+               return slash + 1;
+       }
+
+       return argv0;
 }
 
 void git_set_argv_exec_path(const char *exec_path)