[PATCH v3 08/10] use xgetcwd() to set $GIT_DIR
- From
René Scharfe <l.s.r@web.de>
- Date
- Jul 28, 2014, 18:31 UTC
- Message-ID
- <53D6971D.80107@web.de>
- In-Reply-To
- <53D694A2.8030007@web.de>
Instead of dying of a segmentation fault if getcwd() returns NULL, use xgetcwd() to make sure to write a useful error message and then exit in an orderly fashion.
Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Rene Scharfe <l.s.r@web.de> --- builtin/init-db.c | 7 +++---- git.c | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c index f6dd172..ab0ea02 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -537,10 +537,9 @@ int cmd_init_db(int argc, const char **argv, const char *prefix) usage(init_db_usage[0]); } if (is_bare_repository_cfg == 1) { - static char git_dir[PATH_MAX+1]; - - setenv(GIT_DIR_ENVIRONMENT, - getcwd(git_dir, sizeof(git_dir)), argc > 0); + char *cwd = xgetcwd(); + setenv(GIT_DIR_ENVIRONMENT, cwd, argc > 0); + free(cwd); } if (init_shared_repository != -1) diff --git a/git.c b/git.c index 47137db..210f1ae 100644 --- a/git.c +++ b/git.c @@ -161,9 +161,10 @@ static int handle_options(const char ***argv, int *argc, int *envchanged) if (envchanged) *envchanged = 1; } else if (!strcmp(cmd, "--bare")) { - static char git_dir[PATH_MAX+1]; + char *cwd = xgetcwd(); is_bare_repository_cfg = 1; - setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir, sizeof(git_dir)), 0); + setenv(GIT_DIR_ENVIRONMENT, cwd, 0); + free(cwd); setenv(GIT_IMPLICIT_WORK_TREE_ENVIRONMENT, "0", 1); if (envchanged) *envchanged = 1;
-- 2.0.2