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

abspath: use strbuf_getcwd() to remember original working directory

Browse Source 
Store the original working directory in a strbuf instead of in a
fixed-sized buffer, in order to be able to handle longer paths.

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:27:34 +02:00 committed by Junio C Hamano
parent 7333ed1788
commit 251277acdf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
abspath.c
View File

@ -41,7 +41,7 @@ static const char *real_path_internal(const char *path, int die_on_error)
* here so that we can chdir() back to it at the end of the * here so that we can chdir() back to it at the end of the
* function: * function:
*/ */
char cwd[1024] = ""; struct strbuf cwd = STRBUF_INIT;
int buf_index = 1; int buf_index = 1;
@ -80,7 +80,7 @@ static const char *real_path_internal(const char *path, int die_on_error)
} }
if (*buf) { if (*buf) {
if (!*cwd && !getcwd(cwd, sizeof(cwd))) { if (!cwd.len && strbuf_getcwd(&cwd)) {
if (die_on_error) if (die_on_error)
die_errno("Could not get current working directory"); die_errno("Could not get current working directory");
else else
@ -142,8 +142,9 @@ static const char *real_path_internal(const char *path, int die_on_error)
retval = buf; retval = buf;
error_out: error_out:
free(last_elem); free(last_elem);
if (*cwd && chdir(cwd)) if (cwd.len && chdir(cwd.buf))
die_errno("Could not change back to '%s'", cwd); die_errno("Could not change back to '%s'", cwd.buf);
strbuf_release(&cwd);
return retval; return retval;
} }