From: Carlo Marcelo Arenas Belon Date: Mon, 27 Dec 2010 10:54:37 GMT Subject: [PATCH] setup: translate symlinks in filename when using absolute paths Message-ID: <1293447277-30598-1-git-send-email-carenas@sajinet.com.pe> 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 --- setup.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/setup.c b/setup.c index 91887a4..e7c0d4d 100644 --- a/setup.c +++ b/setup.c @@ -7,10 +7,13 @@ static int inside_work_tree = -1; 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); -- 1.7.3.4.626.g73e7b.dirty