path: use OS-specific function in MkdirAll, don't always keep trailing slash

ianlancetaylor · ianlancetaylor · commit b86e76681366 · 2018-02-23T18:37:09.000Z
CL 86295 changed MkdirAll to always pass a trailing path separator to support extended-length paths on Windows. However, when Stat is called on an existing file followed by trailing slash, it will return a "not a directory" error, skipping the fast path at the beginning of MkdirAll. This change fixes MkdirAll to only pass the trailing path separator where required on Windows, by using an OS-specific function fixRootDirectory. Updates #23918 Change-Id: I23f84a20e65ccce556efa743d026d352b4812c34 Reviewed-on: https://go-review.googlesource.com/95255 Run-TryBot: Ian Lance Taylor <iant@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: David du Colombier <0intro@gmail.com> Reviewed-by: Alex Brainman <alex.brainman@gmail.com>
diff --git a/src/os/path.go b/src/os/path.go
@@ -40,9 +40,7 @@ func MkdirAll(path string, perm FileMode) error {
 
 	if j > 1 {
 		// Create parent.
-		// Pass trailing path separator to MkdirAll, so our
-		// algorithm works for paths, like \\?\c:\
-		err = MkdirAll(path[0:j], perm)
+		err = MkdirAll(fixRootDirectory(path[:j-1]), perm)
 		if err != nil {
 			return err
 		}
diff --git a/src/os/path_plan9.go b/src/os/path_plan9.go
@@ -13,3 +13,7 @@ const (
 func IsPathSeparator(c uint8) bool {
 	return PathSeparator == c
 }
+
+func fixRootDirectory(p string) string {
+	return p
+}
diff --git a/src/os/path_unix.go b/src/os/path_unix.go
@@ -33,3 +33,7 @@ func basename(name string) string {
 
 	return name
 }
+
+func fixRootDirectory(p string) string {
+	return p
+}
diff --git a/src/os/path_windows.go b/src/os/path_windows.go
@@ -207,3 +207,14 @@ func fixLongPath(path string) string {
 	}
 	return string(pathbuf[:w])
 }
+
+// fixRootDirectory fixes a reference to a drive's root directory to
+// have the required trailing slash.
+func fixRootDirectory(p string) string {
+	if len(p) == len(`\\?\c:`) {
+		if IsPathSeparator(p[0]) && IsPathSeparator(p[1]) && p[2] == '?' && IsPathSeparator(p[3]) && p[5] == ':' {
+			return p + `\`
+		}
+	}
+	return p
+}

Original file line number	Diff line number	Diff line change
`@@ -13,3 +13,7 @@ const (`
`13`	`13`	`func IsPathSeparator(c uint8) bool {`
`14`	`14`	`return PathSeparator == c`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+func fixRootDirectory(p string) string {`
	`18`	`+ return p`
	`19`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -33,3 +33,7 @@ func basename(name string) string {`
`33`	`33`
`34`	`34`	`return name`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+func fixRootDirectory(p string) string {`
	`38`	`+ return p`
	`39`	`+}`