[PATCH v2 2/4] use strbuf_getcwd() to get the current working directory without fixed-sized buffers
From: René Scharfe <hidden>
Date: 2016-06-15 23:01:59
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Rene Scharfe <redacted> --- builtin/init-db.c | 8 ++++---- git.c | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 56f85e2..c4958b6 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c@@ -535,10 +535,10 @@ 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); + struct strbuf cwd = STRBUF_INIT; + strbuf_getcwd(&cwd); + setenv(GIT_DIR_ENVIRONMENT, cwd.buf, argc > 0); + strbuf_release(&cwd); } if (init_shared_repository != -1)
diff --git a/git.c b/git.c
index 5b6c761..3f52c43 100644
--- a/git.c
+++ b/git.c@@ -161,9 +161,11 @@ 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]; + struct strbuf cwd = STRBUF_INIT; is_bare_repository_cfg = 1; - setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir, sizeof(git_dir)), 0); + strbuf_getcwd(&cwd); + setenv(GIT_DIR_ENVIRONMENT, cwd.buf, 0); + strbuf_release(&cwd); setenv(GIT_IMPLICIT_WORK_TREE_ENVIRONMENT, "0", 1); if (envchanged) *envchanged = 1;
--
2.0.2