All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3 1/5] make_absolute_path(): Do not append redundant slash
@ 2010-02-14 15:44 Nguyễn Thái Ngọc Duy
  2010-02-14 15:44 ` [PATCH v3 2/5] init-db, rev-parse --git-dir: do " Nguyễn Thái Ngọc Duy
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Nguyễn Thái Ngọc Duy @ 2010-02-14 15:44 UTC (permalink / raw)
  To: git, João Carlos Mendes Luís, Junio C Hamano,
	Johannes Sixt
  Cc: Nguyễn Thái Ngọc Duy

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>
---
 abspath.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/abspath.c b/abspath.c
index b88122c..c91a29c 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;
 		}
-- 
1.7.0.195.g637a2

^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2010-02-16 19:48 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-14 15:44 [PATCH v3 1/5] make_absolute_path(): Do not append redundant slash Nguyễn Thái Ngọc Duy
2010-02-14 15:44 ` [PATCH v3 2/5] init-db, rev-parse --git-dir: do " Nguyễn Thái Ngọc Duy
2010-02-14 15:44 ` [PATCH v3 3/5] Move offset_1st_component() to path.c Nguyễn Thái Ngọc Duy
2010-02-15 19:43   ` Johannes Sixt
2010-02-16  5:22     ` =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?=
2010-02-16 19:47       ` Johannes Sixt
2010-02-14 15:44 ` [PATCH v3 4/5] Support working directory located at root Nguyễn Thái Ngọc Duy
2010-02-14 15:44 ` [PATCH v3 5/5] Add test for using Git at root of file system Nguyễn Thái Ngọc Duy

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.