Make mingw_offset_1st_component() behave consistently for all paths.

mingw_offset_1st_component() returns "foo" for inputs "/foo" and "c:/foo", but inconsistently returns "/foo" for UNC input "/machine/share/foo". Fix it to return "foo" for all cases. Reference: http://groups.google.com/group/msysgit/browse_thread/thread/c0af578549b5dda0 Signed-off-by: Eric Sunshine <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
git · patthoyts · Jul 13, 2010 · Jul 13, 2010 · Jul 26, 2009 · Sep 29, 2011
commit a6dfde5a1d4ca82aabc21bfe1f6126906ed60bdb
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -1852,23 +1852,24 @@ const char *get_windows_home_directory(void)
 
 int mingw_offset_1st_component(const char *path)
 {
+	int offset = 0;
 	if (has_dos_drive_prefix(path))
-		return 2 + is_dir_sep(path[2]);
+		offset = 2;
 
 	/* unc paths */
-	if (is_dir_sep(path[0]) && is_dir_sep(path[1])) {
+	else if (is_dir_sep(path[0]) && is_dir_sep(path[1])) {
 
 		/* skip server name */
 		char *pos = strpbrk(path + 2, "\\/");
 		if (!pos)
-			return 0;
+			return 0; /* Error: malformed unc path */
 
 		do {
 			pos++;
 		} while (*pos && !is_dir_sep(*pos));
 
-		return pos - path;
+		offset = pos - path;
 	}
 
-	return is_dir_sep(path[0]);
+	return offset + is_dir_sep(path[offset]);
 }