diff options
| author |  René Scharfe <l.s.r@web.de> | 2014-07-28 20:31:57 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-08-26 11:06:06 -0700 |
| commit | 4d3ab44d26c47d100cec39d0ef9ed9746eb7e454 (patch) | |
| tree | 8ef114ab2ed8e2667fa12124b18f34df5922c3f3 | |
| parent | use xgetcwd() to get the current directory or die (diff) | |
| download | tgif-4d3ab44d26c47d100cec39d0ef9ed9746eb7e454.tar.xz | |
use xgetcwd() to set $GIT_DIR
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/init-db.c | 7 | ||||
| -rw-r--r-- | git.c | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/builtin/init-db.c b/builtin/init-db.c index f6dd1727ec..ab0ea02d25 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) @@ -125,9 +125,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; |