Merge branch 'rs/strbuf-getcwd'
Reduce the use of fixed sized buffer passed to getcwd() calls by introducing xgetcwd() helper. * rs/strbuf-getcwd: use strbuf_add_absolute_path() to add absolute paths abspath: convert absolute_path() to strbuf use xgetcwd() to set $GIT_DIR use xgetcwd() to get the current directory or die wrapper: add xgetcwd() abspath: convert real_path_internal() to strbuf abspath: use strbuf_getcwd() to remember original working directory setup: convert setup_git_directory_gently_1 et al. to strbuf unix-sockets: use strbuf_getcwd() strbuf: add strbuf_getcwd()
This commit is contained in:
7
trace.c
7
trace.c
@@ -298,13 +298,12 @@ void trace_repo_setup(const char *prefix)
|
||||
{
|
||||
static struct trace_key key = TRACE_KEY_INIT(SETUP);
|
||||
const char *git_work_tree;
|
||||
char cwd[PATH_MAX];
|
||||
char *cwd;
|
||||
|
||||
if (!trace_want(&key))
|
||||
return;
|
||||
|
||||
if (!getcwd(cwd, PATH_MAX))
|
||||
die("Unable to get current working directory");
|
||||
cwd = xgetcwd();
|
||||
|
||||
if (!(git_work_tree = get_git_work_tree()))
|
||||
git_work_tree = "(null)";
|
||||
@@ -316,6 +315,8 @@ void trace_repo_setup(const char *prefix)
|
||||
trace_printf_key(&key, "setup: worktree: %s\n", quote_crnl(git_work_tree));
|
||||
trace_printf_key(&key, "setup: cwd: %s\n", quote_crnl(cwd));
|
||||
trace_printf_key(&key, "setup: prefix: %s\n", quote_crnl(prefix));
|
||||
|
||||
free(cwd);
|
||||
}
|
||||
|
||||
int trace_want(struct trace_key *key)
|
||||
|
||||
Reference in New Issue
Block a user