From: Johannes Sixt <johannes.sixt@telecom.at>
Date: Fri, 30 Nov 2007 20:36:00 +0000 (+0100)
Subject: Windows: Handle absolute paths in safe_create_leading_directories().
X-Git-Tag: v1.6.0-rc0~159^2~31
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8385abfda533819be9fbec436230ccd7be4bcda8;p=git.git

Windows: Handle absolute paths in safe_create_leading_directories().

In this function we must be careful to handle drive-local paths else there
is a danger that it runs into an infinite loop.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
---

diff --git a/sha1_file.c b/sha1_file.c
index 6f004ffd0..0a54eed76 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -83,14 +83,18 @@ int get_sha1_hex(const char *hex, unsigned char *sha1)
 	return 0;
 }
 
+static inline int offset_1st_component(const char *path)
+{
+	if (has_dos_drive_prefix(path))
+		return 2 + (path[2] == '/');
+	return *path == '/';
+}
+
 int safe_create_leading_directories(char *path)
 {
-	char *pos = path;
+	char *pos = path + offset_1st_component(path);
 	struct stat st;
 
-	if (is_absolute_path(path))
-		pos++;
-
 	while (pos) {
 		pos = strchr(pos, '/');
 		if (!pos)