---

yaml
---
r: 3218
b: refs/heads/master
c: 8c6354c
h: refs/heads/master
v: v3

Author: unknown

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c57b8baf5e71e114da226293f15cd96d5baacac
+refs/heads/master: 8c6354ceb905895c9f305716c66d5c7a8e4d0225

trunk/src/lib/fs.rs

@@ -1,5 +1,7 @@
 
 import os::getcwd;
+import os_fs;
+import str;
 
 native "rust" mod rustrt {
     fn rust_file_is_dir(str path) -> int;
@@ -58,13 +60,12 @@ fn list_dir(path p) -> vec[str] {
     ret full_paths;
 }
 
-// FIXME: Windows absolute paths can start with \ for C:\ or
-// whatever... However, we're under MinGW32 so we have the same rules and
-// posix has.
 fn path_is_absolute(path p) -> bool {
-    ret p.(0) == '/';
+    ret os_fs::path_is_absolute(p);
 }
 
+// FIXME: under Windows, we should prepend the current drive letter to paths
+// that start with a slash.
 fn make_absolute(path p) -> path {
     if(path_is_absolute(p)) {
         ret p;

trunk/src/lib/posix_fs.rs

@@ -32,6 +32,10 @@ fn list_dir(str path) -> vec[str] {
 
 }
 
+fn path_is_absolute(str p) -> bool {
+    ret str::char_at(p, 0u) == '/';
+}
+
 const char path_sep = '/';
 
 const char alt_path_sep = '/';

trunk/src/lib/win32_fs.rs

@@ -7,6 +7,11 @@ native "rust" mod rustrt {
 
 fn list_dir(str path) -> vec[str] { ret rustrt::rust_list_files(path + "*"); }
 
+fn path_is_absolute(str p) -> bool {
+    ret str::char_at(p, 0u) == '/' 
+        || (str::char_at(p, 1u) == ':' && str::char_at(p, 2u) == '\\');
+}
+
 /* FIXME: win32 path handling actually accepts '/' or '\' and has subtly
  * different semantics for each. Since we build on mingw, we are usually
  * dealing with /-separated paths. But the whole interface to splitting and