diff options
| author |  Jeff King <peff@peff.net> | 2014-06-19 17:28:00 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-06-19 15:20:55 -0700 |
| commit | a0279e1865c7ce7417c0134e2ab32b20531f502a (patch) | |
| tree | 1033a3f6cf8dd7435e34cd398e239b134b8fe1d0 | |
| parent | use xstrfmt to replace xmalloc + strcpy/strcat (diff) | |
| download | tgif-a0279e1865c7ce7417c0134e2ab32b20531f502a.tar.xz | |
setup_git_env: use git_pathdup instead of xmalloc + sprintf
This is shorter, harder to get wrong, and more clearly
captures the intent.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | environment.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/environment.c b/environment.c index 4dac5e9edd..4de7b812ad 100644 --- a/environment.c +++ b/environment.c @@ -135,15 +135,11 @@ static void setup_git_env(void) gitfile = read_gitfile(git_dir); git_dir = xstrdup(gitfile ? gitfile : git_dir); git_object_dir = getenv(DB_ENVIRONMENT); - if (!git_object_dir) { - git_object_dir = xmalloc(strlen(git_dir) + 9); - sprintf(git_object_dir, "%s/objects", git_dir); - } + if (!git_object_dir) + git_object_dir = git_pathdup("objects"); git_index_file = getenv(INDEX_ENVIRONMENT); - if (!git_index_file) { - git_index_file = xmalloc(strlen(git_dir) + 7); - sprintf(git_index_file, "%s/index", git_dir); - } + if (!git_index_file) + git_index_file = git_pathdup("index"); git_graft_file = getenv(GRAFT_ENVIRONMENT); if (!git_graft_file) git_graft_file = git_pathdup("info/grafts"); |