summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorCarlo Marcelo Arenas Belon <carenas@sajinet.com.pe>2010-12-27 10:54:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-01-04 21:44:41 (GMT)
commit18e051a3981f38db08521bb61ccf7e4571335353 (patch)
treefeb3a76f9899832572c5fdeb021b99b04445df81 /setup.c
parent0ed748134748579a13cf27e1e8b3e55371bcd9dc (diff)
downloadgit-18e051a3981f38db08521bb61ccf7e4571335353.zip
git-18e051a3981f38db08521bb61ccf7e4571335353.tar.gz
git-18e051a3981f38db08521bb61ccf7e4571335353.tar.bz2
setup: translate symlinks in filename when using absolute paths
otherwise, comparison to validate against work tree will fail when the path includes a symlink and the name passed is not canonical. Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'setup.c')
-rw-r--r--setup.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/setup.c b/setup.c
index be550af..8031f99 100644
--- a/setup.c
+++ b/setup.c
@@ -7,10 +7,13 @@ static int inside_work_tree = -1;
const char *prefix_path(const char *prefix, int len, const char *path)
{
const char *orig = path;
- char *sanitized = xmalloc(len + strlen(path) + 1);
- if (is_absolute_path(orig))
- strcpy(sanitized, path);
- else {
+ char *sanitized;
+ if (is_absolute_path(orig)) {
+ const char *temp = make_absolute_path(path);
+ sanitized = xmalloc(len + strlen(temp) + 1);
+ strcpy(sanitized, temp);
+ } else {
+ sanitized = xmalloc(len + strlen(path) + 1);
if (len)
memcpy(sanitized, prefix, len);
strcpy(sanitized + len, path);