Merge branch 'sk/windows-unc-path'

gitster · gitster · commit b83163643bd7 · 2014-06-16T10:07:03.000-07:00
* sk/windows-unc-path:
  Windows: allow using UNC path for git repository
diff --git a/cache.h b/cache.h
@@ -826,7 +826,6 @@ int normalize_path_copy(char *dst, const char *src);
 int longest_ancestor_length(const char *path, struct string_list *prefixes);
 char *strip_path_suffix(const char *path, const char *suffix);
 int daemon_avoid_alias(const char *path);
-int offset_1st_component(const char *path);
 
 /* object replacement */
 #define LOOKUP_REPLACE_OBJECT 1
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -1823,3 +1823,27 @@ pid_t waitpid(pid_t pid, int *status, int options)
 	errno = EINVAL;
 	return -1;
 }
+
+int mingw_offset_1st_component(const char *path)
+{
+	int offset = 0;
+	if (has_dos_drive_prefix(path))
+		offset = 2;
+
+	/* unc paths */
+	else if (is_dir_sep(path[0]) && is_dir_sep(path[1])) {
+
+		/* skip server name */
+		char *pos = strpbrk(path + 2, "\\/");
+		if (!pos)
+			return 0; /* Error: malformed unc path */
+
+		do {
+			pos++;
+		} while (*pos && !is_dir_sep(*pos));
+
+		offset = pos - path;
+	}
+
+	return offset + is_dir_sep(path[offset]);
+}
diff --git a/compat/mingw.h b/compat/mingw.h
@@ -339,6 +339,8 @@ static inline char *mingw_find_last_dir_sep(const char *path)
 	return ret;
 }
 #define find_last_dir_sep mingw_find_last_dir_sep
+int mingw_offset_1st_component(const char *path);
+#define offset_1st_component mingw_offset_1st_component
 #define PATH_SEP ';'
 #define PRIuMAX "I64u"
 #define PRId64 "I64d"
diff --git a/git-compat-util.h b/git-compat-util.h
@@ -267,6 +267,10 @@ extern char *gitbasename(char *);
 #define has_dos_drive_prefix(path) 0
 #endif
 
+#ifndef offset_1st_component
+#define offset_1st_component(path) (is_dir_sep((path)[0]))
+#endif
+
 #ifndef is_dir_sep
 #define is_dir_sep(c) ((c) == '/')
 #endif
diff --git a/path.c b/path.c
@@ -823,10 +823,3 @@ int daemon_avoid_alias(const char *p)
 		}
 	}
 }
-
-int offset_1st_component(const char *path)
-{
-	if (has_dos_drive_prefix(path))
-		return 2 + is_dir_sep(path[2]);
-	return is_dir_sep(path[0]);
-}

Original file line number	Diff line number	Diff line change
`@@ -339,6 +339,8 @@ static inline char mingw_find_last_dir_sep(const char path)`
`339`	`339`	`return ret;`
`340`	`340`	`}`
`341`	`341`	`#define find_last_dir_sep mingw_find_last_dir_sep`
	`342`	`+int mingw_offset_1st_component(const char *path);`
	`343`	`+#define offset_1st_component mingw_offset_1st_component`
`342`	`344`	`#define PATH_SEP ';'`
`343`	`345`	`#define PRIuMAX "I64u"`
`344`	`346`	`#define PRId64 "I64d"`
Original file line number	Diff line number	Diff line change
`@@ -823,10 +823,3 @@ int daemon_avoid_alias(const char *p)`
`823`	`823`	`}`
`824`	`824`	`}`
`825`	`825`	`}`
`826`		`-`
`827`		`-int offset_1st_component(const char *path)`
`828`		`-{`
`829`		`- if (has_dos_drive_prefix(path))`
`830`		`- return 2 + is_dir_sep(path[2]);`
`831`		`- return is_dir_sep(path[0]);`
`832`		`-}`