From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 2 Sep 2008 21:10:15 +0000 (-0700)
Subject: safe_create_leading_directories(): make it about "leading" directories
X-Git-Tag: v1.6.1-rc1~208^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5f0bdf50c2eb640b4321acb9b34b3cb401f5ddfb;p=git.git

safe_create_leading_directories(): make it about "leading" directories

We used to allow callers to pass "foo/bar/" to make sure both "foo" and
"foo/bar" exist and have good permissions, but this interface is too error
prone.  If a caller mistakenly passes a path with trailing slashes
(perhaps it forgot to verify the user input) even when it wants to later
mkdir "bar" itself, it will find that it cannot mkdir "bar".  If such a
caller does not bother to check the error for EEXIST, it may even
errorneously die().

Because we have no existing callers to use that obscure feature, this
patch removes it to avoid confusion.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/sha1_file.c b/sha1_file.c
index 477d3fb4b..f85c8cec3 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -99,7 +99,11 @@ int safe_create_leading_directories(char *path)
 		pos = strchr(pos, '/');
 		if (!pos)
 			break;
-		*pos = 0;
+		while (*++pos == '/')
+			;
+		if (!*pos)
+			break;
+		*--pos = '\0';
 		if (!stat(path, &st)) {
 			/* path exists */
 			if (!S_ISDIR(st.st_mode)) {