undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use xgetcwd() to set $GIT_DIR

Browse Source 
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>
This commit is contained in:
René Scharfe 2014-07-28 20:31:57 +02:00 committed by Junio C Hamano
parent 56b9f6e738
commit 4d3ab44d26
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/init-db.c
View File

@ -537,10 +537,9 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
usage(init_db_usage[0]); usage(init_db_usage[0]);
} }
if (is_bare_repository_cfg == 1) { if (is_bare_repository_cfg == 1) {
static char git_dir[PATH_MAX+1]; char *cwd = xgetcwd();
setenv(GIT_DIR_ENVIRONMENT, cwd, argc > 0);
setenv(GIT_DIR_ENVIRONMENT, free(cwd);
getcwd(git_dir, sizeof(git_dir)), argc > 0);
} }
if (init_shared_repository != -1) if (init_shared_repository != -1)

5
git.c
View File

@ -125,9 +125,10 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
if (envchanged) if (envchanged)
*envchanged = 1; *envchanged = 1;
} else if (!strcmp(cmd, "--bare")) { } else if (!strcmp(cmd, "--bare")) {
static char git_dir[PATH_MAX+1]; char *cwd = xgetcwd();
is_bare_repository_cfg = 1; 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); setenv(GIT_IMPLICIT_WORK_TREE_ENVIRONMENT, "0", 1);
if (envchanged) if (envchanged)
*envchanged = 1; *envchanged = 1;