Add basic file-system functionality

std.fs.list_dir will list the files in a directory, std.fs.file_is_dir
will, given a pathname, determine whether it is a directory or not.

Author: marijnh

src/lib/_str.rs

@@ -106,6 +106,11 @@ fn from_bytes(vec[u8] v) : is_utf8(v) -> str {
     ret rustrt.str_from_vec(v);
 }
 
+// FIXME temp thing
+fn unsafe_from_bytes(vec[u8] v) -> str {
+    ret rustrt.str_from_vec(v);
+}
+
 fn refcount(str s) -> uint {
     auto r = rustrt.refcount[u8](s);
     if (r == dbg.const_refcount) {

src/lib/fs.rs

@@ -0,0 +1,20 @@
+native "rust" mod rustrt {
+  fn rust_file_is_dir(str path) -> int;
+}
+
+impure fn file_is_dir(str path) -> bool {
+  ret rustrt.rust_file_is_dir(path) != 0;
+}
+
+impure fn list_dir(str path) -> vec[str] {
+  if (path.(_str.byte_len(path)-1u) as char != os_fs.path_sep) {
+    path += _str.unsafe_from_bytes(vec(os_fs.path_sep as u8));
+  }
+  let vec[str] full_paths = vec();
+  for (str filename in os_fs.list_dir(path)) {
+    if (!_str.eq(filename, ".")) {if (!_str.eq(filename, "..")) {
+      full_paths = _vec.push[str](full_paths, path + filename);
+    }}
+  }
+  ret full_paths;
+}

src/lib/linux_os.rs

@@ -15,9 +15,10 @@ native mod libc = "libc.so.6" {
     fn ungetc(int c, FILE f);
 
     type dir;
-    // readdir is a mess; handle via wrapper function in rustrt.
     fn opendir(sbuf d) -> dir;
     fn closedir(dir d) -> int;
+    type dirent;
+    fn readdir(dir d) -> dirent;
 
     fn getenv(sbuf n) -> sbuf;
     fn setenv(sbuf n, sbuf v, int overwrite) -> int;

src/lib/macos_os.rs

@@ -15,9 +15,10 @@ native mod libc = "libc.dylib" {
     fn ungetc(int c, FILE f);
 
     type dir;
-    // readdir is a mess; handle via wrapper function in rustrt.
     fn opendir(sbuf d) -> dir;
     fn closedir(dir d) -> int;
+    type dirent;
+    fn readdir(dir d) -> dirent;
 
     fn getenv(sbuf n) -> sbuf;
     fn setenv(sbuf n, sbuf v, int overwrite) -> int;

src/lib/posix_fs.rs

@@ -0,0 +1,19 @@
+native "rust" mod rustrt {
+  fn rust_dirent_filename(os.libc.dirent ent) -> str;
+}
+
+impure fn list_dir(str path) -> vec[str] {
+  // TODO ensure this is always closed
+  auto dir = os.libc.opendir(_str.buf(path));
+  check (dir as uint != 0u);
+  let vec[str] result = vec();
+  while (true) {
+    auto ent = os.libc.readdir(dir);
+    if (ent as int == 0) {break;}
+    result = _vec.push[str](result, rustrt.rust_dirent_filename(ent));
+  }
+  os.libc.closedir(dir);
+  ret result;
+}
+
+const char path_sep = '/';

src/lib/std.rc

@@ -26,6 +26,8 @@ mod util;
 // Authorize various rule-bendings.
 
 auth io = unsafe;
+auth fs = unsafe;
+auth os_fs = unsafe;
 auth _str = unsafe;
 auth _vec = unsafe;
 auth _task = unsafe;
@@ -41,12 +43,17 @@ auth rand.mk_rng = unsafe;
 alt (target_os) {
     case ("win32") {
         mod os = "win32_os.rs";
+        mod os_fs = "win32_fs.rs";
     } case ("macos") {
         mod os = "macos_os.rs";
+        mod os_fs = "posix_fs.rs";
     } else {
         mod os = "linux_os.rs";
+        mod os_fs = "posix_fs.rs";
     }
- }
+}
+mod fs;
+
 
 // FIXME: parametric
 mod map;

src/lib/win32_fs.rs

@@ -0,0 +1,10 @@
+native "rust" mod rustrt {
+  fn rust_list_files[T,U](str path) -> vec[str];
+  fn rust_file_is_dir(str path) -> int;
+}
+
+impure fn list_dir(str path) -> vec[str] {
+  ret rustrt.rust_list_files[vec[str],str](path+"*");
+}
+
+const char path_sep = '\\';

src/rt/rust_builtin.cpp

@@ -1,4 +1,7 @@
 
+#include <dirent.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include "rust_internal.h"
 
 /* Native builtins. */
@@ -371,6 +374,46 @@ debug_trap(rust_task *task, rust_str *s)
     __asm__("int3");
 }
 
+rust_str* c_str_to_rust(rust_task *task, char const *str) {
+    size_t len = strlen(str) + 1;
+    return str_alloc_with_data(task, len, len, (uint8_t const *)str);
+}
+
+#if defined(__WIN32__)
+extern "C" CDECL rust_vec*
+rust_list_files(rust_task *task, type_desc *vec_desc,
+                type_desc *str_desc, rust_str *path) {
+    rust_str* strings[200];
+    size_t pos = 0;
+    WIN32_FIND_DATA FindFileData;
+    HANDLE hFind = FindFirstFile((char*)path->data, &FindFileData);
+    if (hFind != INVALID_HANDLE_VALUE) {
+        strings[pos++] = c_str_to_rust(task, FindFileData.cFileName);
+        while (FindNextFile(hFind, &FindFileData)) {
+            strings[pos++] = c_str_to_rust(task, FindFileData.cFileName);
+        }
+        FindClose(hFind);
+    }
+    rust_vec* result = vec_alloc(task, vec_desc, str_desc, pos);
+    for (size_t i = 0; i < pos; ++i) {
+        *(rust_str**)vec_buf(task, str_desc, result, i) = strings[i];
+    }
+    vec_len_set(task, str_desc, result, pos);
+    return result;
+}
+#else
+extern "C" CDECL rust_str *
+rust_dirent_filename(rust_task *task, dirent* ent) {
+    return c_str_to_rust(task, ent->d_name);
+}
+#endif
+
+extern "C" CDECL int
+rust_file_is_dir(rust_task *task, rust_str *path) {
+    struct stat buf;
+    stat((char*)path->data, &buf);
+    return S_ISDIR(buf.st_mode);
+}
 
 //
 // Local Variables: