mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 20:14:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

git_extract_argv0_path(): Move check for valid argv0 from caller to callee

Browse Source 
This simplifies the calling code.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Acked-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Steffen Prohaska 2009-01-18 13:00:11 +01:00 committed by Junio C Hamano
parent 4dd47c3b86
commit 2cd72b0b29
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
exec_cmd.c
View File

@ -22,7 +22,11 @@ const char *system_path(const char *path)
const char *git_extract_argv0_path(const char *argv0) const char *git_extract_argv0_path(const char *argv0)
{ {
const char *slash = argv0 + strlen(argv0); const char *slash;
if (!argv0 || !*argv0)
return NULL;
slash = argv0 + strlen(argv0);
while (argv0 <= slash && !is_dir_sep(*slash)) while (argv0 <= slash && !is_dir_sep(*slash))
slash--; slash--;

5
git.c
View File

@ -444,9 +444,8 @@ int main(int argc, const char **argv)
{ {
const char *cmd; const char *cmd;
if (argv[0] && *argv[0]) cmd = git_extract_argv0_path(argv[0]);
cmd = git_extract_argv0_path(argv[0]); if (!cmd)
else
cmd = "git-help"; cmd = "git-help";
/* /*