move fs routines to c-stack-stdlib

diff --git a/src/lib/fs.rs b/src/lib/fs.rs
index ec389593f5beeceebf91012cb1abbc93b854fb0a..9a539f4b826de3f6bc73f024597d5dc7076c5fd5 100644 (file)
--- a/src/lib/fs.rs
+++ b/src/lib/fs.rs
@@ -2,7 +2,7 @@
 import os::getcwd;
 import os_fs;
 
-native "rust" mod rustrt {
+native "c-stack-cdecl" mod rustrt {
     fn rust_file_is_dir(path: str::sbuf) -> int;
 }
 

diff --git a/src/lib/posix_fs.rs b/src/lib/posix_fs.rs
index 5ebebc2748a35f9dcbac1bfe038e19b71764719c..3a518c7b9665f2ab6f82b60cd1fa1de86092f4f0 100644 (file)
--- a/src/lib/posix_fs.rs
+++ b/src/lib/posix_fs.rs
@@ -1,5 +1,5 @@
 
-native "rust" mod rustrt {
+native "c-stack-cdecl" mod rustrt {
     fn rust_list_files(&&path: str) -> [str];
 }
 

diff --git a/src/lib/win32_fs.rs b/src/lib/win32_fs.rs
index e1bfb24b6d1829bad06ccbe15338d9613c1071f5..2fe6acd43997fb3f308a7ad3cf676286db0033d5 100644 (file)
--- a/src/lib/win32_fs.rs
+++ b/src/lib/win32_fs.rs
@@ -1,6 +1,6 @@
 
 
-native "rust" mod rustrt {
+native "c-stack-cdecl" mod rustrt {
     fn rust_list_files(&&path: str) -> [str];
     fn rust_file_is_dir(&&path: str) -> int;
 }

diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index 57d682ec4978154a7be21f66d03f3dd82b88bd05..ae129a9380d4882d708ba9df31765c2f1ff3ed27 100644 (file)
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -325,12 +325,12 @@ debug_ptrcast(type_desc *from_ty,
 }
 
 extern "C" CDECL rust_vec*
-rust_list_files(rust_vec **path) {
+rust_list_files(rust_str *path) {
     rust_task *task = rust_scheduler::get_task();
     array_list<rust_str*> strings;
 #if defined(__WIN32__)
     WIN32_FIND_DATA FindFileData;
-    HANDLE hFind = FindFirstFile((char*)(*path)->data, &FindFileData);
+    HANDLE hFind = FindFirstFile((char*)path->data, &FindFileData);
     if (hFind != INVALID_HANDLE_VALUE) {
         do {
             rust_str *str = make_str(task->kernel, FindFileData.cFileName,
@@ -341,7 +341,7 @@ rust_list_files(rust_vec **path) {
         FindClose(hFind);
     }
 #else
-    DIR *dirp = opendir((char*)(*path)->data);
+    DIR *dirp = opendir((char*)path->data);
   if (dirp) {
       struct dirent *dp;
       while ((dp = readdir(dirp))) {