[PATCH 1/4] make_absolute_path(): Do not append redundant slash
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:48:12
Subsystem:
the rest · Maintainer:
Linus Torvalds
make_absolute_path("foo") at root returns "//foo". This patch makes it
return "/foo" correctly.
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted>
---
.. so that "git init" will show "initialized empty Git in /.git"
abspath.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/abspath.c b/abspath.c
index b88122c..e72aede 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 (*buf != '/' || buf[1] != '\0') + buf[len++] = '/'; + strcpy(buf + len, last_elem); free(last_elem); last_elem = NULL; }
--
1.7.0.rc2.182.g3adef