---

yaml
---
r: 5112
b: refs/heads/master
c: 8f531e7
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baa1e8790d6c8d04de5a371a1c231ca9f2caa3b0
+refs/heads/master: 8f531e769a025859eeebf6e99c50c4b786fb0814

trunk/src/lib/fs.rs

@@ -4,7 +4,7 @@ import os_fs;
 import str;
 
 native "rust" mod rustrt {
-    fn rust_file_is_dir(path: str) -> int;
+    fn rust_file_is_dir(path: istr::sbuf) -> int;
 }
 
 fn path_sep() -> istr { ret istr::from_char(os_fs::path_sep); }
@@ -43,7 +43,9 @@ fn connect(pre: &path, post: &path) -> path {
 }
 
 fn file_is_dir(p: &path) -> bool {
-    ret rustrt::rust_file_is_dir(istr::to_estr(p)) != 0;
+    ret istr::as_buf(p, { |buf|
+        rustrt::rust_file_is_dir(buf) != 0
+    });
 }
 
 fn list_dir(p: &path) -> [istr] {

trunk/src/rt/rust_builtin.cpp

@@ -444,9 +444,9 @@ rust_dirent_filename(rust_task *task, dirent* ent) {
 #endif
 
 extern "C" CDECL int
-rust_file_is_dir(rust_task *task, rust_str *path) {
+rust_file_is_dir(rust_task *task, char *path) {
     struct stat buf;
-    if (stat((char*)path->data, &buf)) {
+    if (stat(path, &buf)) {
         return 0;
     }
     return S_ISDIR(buf.st_mode);