qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-27 05:11:22 -07:00
Code Releases Activity

os: handle backslash and slash both in the path on Windows

Browse Source 
Fixes #35492

Change-Id: I00dce8fd1228f809e0c61013ac4de7a5953cbbf9
Reviewed-on: https://go-review.googlesource.com/c/go/+/206997
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Yasuhiro Matsumoto 2019-11-13 10:02:17 +09:00 committed by Ian Lance Taylor
parent 608b94bef2
commit e77106cc54
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/os/file_windows.go
View File

@ -111,10 +111,17 @@ func openDir(name string) (file *File, err error) {
path := fixLongPath(name)
if len(path) == 2 && path[1] == ':' || (len(path) > 0 && path[len(path)-1] == '\\') { // it is a drive letter, like C:
if len(path) == 2 && path[1] == ':' { // it is a drive letter, like C:
mask = path + `*`
} else if len(path) > 0 {
lc := path[len(path)-1]
if lc == '/' || lc == '\\' {
mask = path + `*`
} else {
mask = path + `\*`
}
} else {
mask = path + `\*`
mask = `\*`
}
maskp, e := syscall.UTF16PtrFromString(mask)
if e != nil {

15
src/os/path_windows_test.go
View File

@ -74,3 +74,18 @@ func TestMkdirAllExtendedLength(t *testing.T) {
t.Fatalf("MkdirAll(%q) should have failed, but did not", path)
}
}
func TestOpenRootSlash(t *testing.T) {
tests := []string{
`/`,
`\`,
}
for _, test := range tests {
dir, err := os.Open(test)
if err != nil {
t.Fatalf("Open(%q) failed: %v", test, err)
}
dir.Close()
}
}