aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-02-14 22:44:41 +0700
committerJunio C Hamano <gitster@pobox.com>2010-02-14 13:21:31 -0800
commited0cb46ebb020234da94a843ca341dde8e9e3911 (patch)
tree80997641ffa0b56b3460b66ec70abcf4d3080cc8
parent4133fd25525022f99d2c7ba339618433bdd919fe (diff)
downloadgit-ed0cb46ebb020234da94a843ca341dde8e9e3911.tar.gz
git-ed0cb46ebb020234da94a843ca341dde8e9e3911.tar.xz
make_absolute_path(): Do not append redundant slash
When concatenating two paths, if the first one already have '/', do not put another '/' in between the two paths. Usually this is not the case as getcwd() won't return '/foo/bar/', except when you are standing at root, then it will return '/'. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--abspath.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/abspath.c b/abspath.c
index b88122cbe..c91a29cb2 100644
--- a/abspath.c
+++ b/abspath.c
@@ -54,8 +54,9 @@ const char *make_absolute_path(const char *path)
if (len + strlen(last_elem) + 2 > PATH_MAX)
die ("Too long path name: '%s/%s'",
buf, last_elem);
- buf[len] = '/';
- strcpy(buf + len + 1, last_elem);
+ if (len && buf[len-1] != '/')
+ buf[len++] = '/';
+ strcpy(buf + len, last_elem);
free(last_elem);
last_elem = NULL;
}