Commit 4dd47c3b authored by Steve Haslam's avatar Steve Haslam Committed by Junio C Hamano

Refactor git_set_argv0_path() to git_extract_argv0_path()

This commit moves the code that computes the dirname of argv[0]
from git.c's main() to git_set_argv0_path() and renames the function
to git_extract_argv0_path().  This makes the code in git.c's main
less cluttered, and we can use the dirname computation from other
main() functions too.

[ spr:
 - split Steve's original commit and wrote new commit message.
 - Integrated Johannes Schindelin's
   cca17048 while rebasing onto master.
Signed-off-by: default avatarSteve Haslam <>
Signed-off-by: default avatarSteffen Prohaska <>
Acked-by: default avatarJohannes Sixt <>
Signed-off-by: default avatarJunio C Hamano <>
parent 026fa0d5
......@@ -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))
if (slash >= argv0) {
argv0_path = xstrndup(argv0, slash - argv0);
return slash + 1;
return argv0;
void git_set_argv_exec_path(const char *exec_path)
......@@ -2,8 +2,8 @@
#define GIT_EXEC_CMD_H
extern void git_set_argv_exec_path(const char *exec_path);
extern void git_set_argv0_path(const char *path);
extern const char* git_exec_path(void);
extern const char *git_extract_argv0_path(const char *path);
extern const char *git_exec_path(void);
extern void setup_path(void);
extern const char **prepare_git_cmd(const char **argv);
extern int execv_git_cmd(const char **argv); /* NULL terminated */
......@@ -442,21 +442,12 @@ static int run_argv(int *argcp, const char ***argv)
int main(int argc, const char **argv)
const char *cmd = argv[0] && *argv[0] ? argv[0] : "git-help";
char *slash = (char *)cmd + strlen(cmd);
const char *cmd;
* Take the basename of argv[0] as the command
* name, and the dirname as the default exec_path
* if we don't have anything better.
while (cmd <= slash && !is_dir_sep(*slash))
if (cmd <= slash) {
*slash++ = 0;
cmd = slash;
if (argv[0] && *argv[0])
cmd = git_extract_argv0_path(argv[0]);
cmd = "git-help";
* "git-xxxx" is the same as "git xxxx", but we obviously:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment