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 direname computation from other
main() functions too.

[spr: split Steve's original commit and wrote new commit message. ]

Signed-off-by: Steve Haslam <shaslam@lastminute.com>
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
This commit is contained in:
Steve Haslam
2008-07-30 12:27:18 +01:00
committed by Steffen Prohaska
parent 7b6c649637
commit f2fdec9deb
3 changed files with 19 additions and 18 deletions

View File

@@ -54,9 +54,20 @@ 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);
do
--slash;
while (slash >= argv0 && !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)

View File

@@ -2,7 +2,7 @@
#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_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);

20
git.c
View File

@@ -416,23 +416,13 @@ static void execv_dashed_external(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;
int done_alias = 0;
/*
* 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.
*/
do
--slash;
while (cmd <= slash && !is_dir_sep(*slash));
if (cmd <= slash) {
*slash++ = 0;
git_set_argv0_path(cmd);
cmd = slash;
}
if (argv[0] && *argv[0])
cmd = git_extract_argv0_path(argv[0]);
else
cmd = "git-help";
/*
* "git-xxxx" is the same as "git xxxx", but we obviously: