splitdrive under windows (JuliaLang#19695)

* splitdrive under windows * splitdrive under windows tests * more test * move tests outside loop over S * changed test cases to S("...")
andyferris · Jan 4, 2017 · a9b114c · a9b114c
1 parent 02ad926
commit a9b114c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/base/path.jl b/base/path.jl
@@ -34,7 +34,7 @@ elseif is_windows()
     const path_ext_splitter = r"^((?:.*[/\\])?(?:\.|[^/\\\.])[^/\\]*?)(\.[^/\\\.]*|)$"
 
     function splitdrive(path::String)
-        m = match(r"^(\w+:|\\\\\w+\\\w+|\\\\\?\\UNC\\\w+\\\w+|\\\\\?\\\w+:|)(.*)$", path)
+        m = match(r"^([^\\]+:|\\\\[^\\]+\\[^\\]+|\\\\\?\\UNC\\[^\\]+\\[^\\]+|\\\\\?\\[^\\]+:|)(.*)$", path)
         String(m.captures[1]), String(m.captures[2])
     end
 else

diff --git a/test/path.jl b/test/path.jl
@@ -68,6 +68,15 @@ for S in (String, GenericString)
     @test joinpath(splitdir(S(homedir()))...) == homedir()
     @test string(splitdrive(S(homedir()))...) == homedir()
 
+    if is_windows()
+        @test splitdrive(S("\\\\servername\\hello.world\\filename.ext")) ==
+            ("\\\\servername\\hello.world","\\filename.ext")
+        @test splitdrive(S("\\\\servername.com\\hello.world\\filename.ext")) ==
+            ("\\\\servername.com\\hello.world","\\filename.ext")
+        @test splitdrive(S("C:\\foo\\bar")) ==
+            ("C:","\\foo\\bar")
+    end
+
     @test splitext(S("")) == ("", "")
     @test splitext(S(".")) == (".", "")
     @test_broken splitext(S("..")) == ("..", "")