path/filepath: ignore dot for Dir(`\\server\share`)

Dir(`\\server\share`) returns `\\server\share.`. Change Dir so it
returns `\\server\share` instead.

Fixes #18783

Change-Id: I9e0dd71ea6aea85e6c6114aaa4bb3bea3270d818
Reviewed-on: https://go-review.googlesource.com/35690
Reviewed-by: Alex Brainman <alex.brainman@gmail.com>
Run-TryBot: Alex Brainman <alex.brainman@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/path/filepath/path.go b/src/path/filepath/path.go
index 1d8e35c969e8810aaae51ace5f45b6c69460c150..e35ed5fefda79f44a4b1c60966d27a3ec2e7c83a 100644 (file)
--- a/src/path/filepath/path.go
+++ b/src/path/filepath/path.go
@@ -461,6 +461,10 @@ func Dir(path string) string {
                i--
        }
        dir := Clean(path[len(vol) : i+1])
+       if dir == "." && len(vol) > 2 {
+               // must be UNC
+               return vol
+       }
        return vol + dir
 }
 

diff --git a/src/path/filepath/path_test.go b/src/path/filepath/path_test.go
index 921b23842b458d732304103abe7f5d3e345e2d8c..70baa6112f6ca5a9d97004d8033891a501efe9c6 100644 (file)
--- a/src/path/filepath/path_test.go
+++ b/src/path/filepath/path_test.go
@@ -665,6 +665,7 @@ var windirtests = []PathTest{
        {`c:\a\b`, `c:\a`},
        {`c:a\b`, `c:a`},
        {`c:a\b\c`, `c:a\b`},
+       {`\\host\share`, `\\host\share`},
        {`\\host\share\`, `\\host\share\`},
        {`\\host\share\a`, `\\host\share\`},
        {`\\host\share\a\b`, `\\host\share\a`},