---

yaml
---
r: 5111
b: refs/heads/master
c: baa1e87
h: refs/heads/master
i:
  5109: be9cf3b
  5107: 3d04a46
  5103: f971929
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4951bb8bfc1cfcc7bc0df9ebdaf86610a2c2658f
+refs/heads/master: baa1e8790d6c8d04de5a371a1c231ca9f2caa3b0

trunk/src/rt/rust_builtin.cpp

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

trunk/src/test/stdtest/fs.rs

@@ -14,3 +14,8 @@ fn test_connect() {
 #[test]
 fn test_list_dir_no_invalid_memory_access() { fs::list_dir(~"."); }
 
+#[test]
+fn file_is_dir() {
+    assert fs::file_is_dir(~".");
+    assert !fs::file_is_dir(~"test/stdtest/fs.rs");
+}