From b06dc26a58df0a79e6be3004484809ffd2c60d74 Mon Sep 17 00:00:00 2001 From: Benny Siegert Date: Tue, 30 Nov 2010 17:17:45 -0800 Subject: path: Windows support for Split Make Split work on backslashes as well as on slashes under Windows and support the "C:filename" special case. Also add corresponding tests. R=r, rsc, PeterGo, r2, brainman CC=golang-dev https://golang.org/cl/3008041 --- src/pkg/path/path.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/pkg/path/path.go') diff --git a/src/pkg/path/path.go b/src/pkg/path/path.go index 79b3000930..61eea88588 100644 --- a/src/pkg/path/path.go +++ b/src/pkg/path/path.go @@ -102,17 +102,13 @@ func Clean(path string) string { return string(buf[0:w]) } -// Split splits path immediately following the final slash, +// Split splits path immediately following the final path separator, // separating it into a directory and file name component. -// If there is no slash in path, Split returns an empty dir and +// If there is no separator in path, Split returns an empty dir and // file set to path. func Split(path string) (dir, file string) { - for i := len(path) - 1; i >= 0; i-- { - if path[i] == '/' { - return path[0 : i+1], path[i+1:] - } - } - return "", path + i := strings.LastIndexAny(path, PathSeps) + return path[:i+1], path[i+1:] } // Join joins any number of path elements into a single path, adding a -- cgit v1.3