Merge remote-tracking branch '8byte-jose/win32-unc-fix'

2011-08-28 11:46:43 -07:00 · 2011-08-28 11:46:43 -07:00 · 3949c53343
parent 6fc2c32c4a b3f0ff51aa
commit 3949c53343
1 changed files with 8 additions and 3 deletions
--- a/basis/io/files/windows/windows.factor
+++ b/basis/io/files/windows/windows.factor
@ -325,9 +325,14 @@ M: winnt root-directory? ( path -- ? )
 TR: normalize-separators "/" "\\" ;

 M: winnt normalize-path ( string -- string' )
-    absolute-path
-    normalize-separators
-    prepend-prefix ;
+    dup [ "//" head? ] [ "\\\\" head? ] bi
+    or [
+        normalize-separators
+    ] [
+        absolute-path
+        normalize-separators
+        prepend-prefix
+    ] if ;

 M: winnt CreateFile-flags ( DWORD -- DWORD )
    FILE_FLAG_OVERLAPPED bitor ;