1 files changed, 24 insertions, 22 deletions

diff --git a/std/fs.zc b/std/fs.zc
index c19f9f1..7a54005 100644
--- a/std/fs.zc
+++ b/std/fs.zc
@@ -2,21 +2,23 @@ import "./core.zc"
 import "./result.zc"
 import "./string.zc"
 import "./vec.zc"
+import "./mem.zc"
 
 def Z_SEEK_SET = 0;
 def Z_SEEK_END = 2;
 def Z_F_OK = 0;
 
+include <dirent.h>
+include <sys/stat.h>
+include <unistd.h>
+include <stdlib.h>
+include <stdio.h>
 
 // TODO: restructure this tomorrow.
 raw {
-    #include <dirent.h>
-    #include <sys/stat.h>
-    #include <unistd.h>
-
-    // typedef needed for Vec<DirEntry*> generation if inferred
     typedef struct DirEntry* DirEntryPtr;
     
+    // Wrappers for FILE* handling due to opaque pointer casting
     void* _z_fs_fopen(char* path, char* mode) {
         return fopen(path, mode);
     }
@@ -40,7 +42,9 @@ raw {
     int64_t _z_fs_ftell(void* stream) {
         return (int64_t)ftell((FILE*)stream);
     }
-
+    
+    // Wrappers needed because C headers declare these with 'const char*' 
+    // but Zen C externs generate 'char*', leading to conflicting types.
     int _z_fs_access(char* pathname, int mode) {
         return access(pathname, mode);
     }
@@ -53,6 +57,7 @@ raw {
         return rmdir(pathname);
     }
 
+    // Wrappers for DIR* handling
     void* _z_fs_opendir(char* name) {
         return opendir(name);
     }
@@ -61,14 +66,7 @@ raw {
         return closedir((DIR*)dir);
     }
 
-    void* _z_fs_malloc(size_t size) {
-        return malloc(size);
-    }
-
-    void _z_fs_free(void* ptr) {
-        free(ptr);
-    }
-
+    // struct stat / struct dirent helpers
     int _z_fs_get_metadata(char* path, uint64_t* size, int* is_dir, int* is_file) {
         struct stat st;
         if (stat(path, &st) != 0) return -1;
@@ -96,6 +94,10 @@ raw {
     }
 }
 
+// Direct externs
+extern fn malloc(size: usize) -> void*;
+extern fn free(ptr: void*);
+
 extern fn _z_fs_mkdir(path: char*) -> int;
 extern fn _z_fs_get_metadata(path: char*, size: U64*, is_dir: int*, is_file: int*) -> int;
 extern fn _z_fs_read_entry(dir: void*, out_name: char*, buf_size: int, is_dir: int*) -> int;
@@ -105,13 +107,13 @@ extern fn _z_fs_fread(ptr: void*, size: usize, nmemb: usize, stream: void*) -> u
 extern fn _z_fs_fwrite(ptr: void*, size: usize, nmemb: usize, stream: void*) -> usize;
 extern fn _z_fs_fseek(stream: void*, offset: long, whence: int) -> int;
 extern fn _z_fs_ftell(stream: void*) -> long;
+extern fn _z_fs_opendir(name: char*) -> void*;
+extern fn _z_fs_closedir(dir: void*) -> int;
+
 extern fn _z_fs_access(pathname: char*, mode: int) -> int;
 extern fn _z_fs_unlink(pathname: char*) -> int;
 extern fn _z_fs_rmdir(pathname: char*) -> int;
-extern fn _z_fs_opendir(name: char*) -> void*;
-extern fn _z_fs_closedir(dir: void*) -> int;
-extern fn _z_fs_malloc(size: usize) -> void*;
-extern fn _z_fs_free(ptr: void*);
+
 
 struct File {
     handle: void*;
@@ -153,7 +155,7 @@ impl File {
         let size = _z_fs_ftell(self.handle);
         _z_fs_fseek(self.handle, 0, Z_SEEK_SET);
         
-        let buffer: char* = _z_fs_malloc((usize)size + 1);
+        let buffer: char* = malloc((usize)size + 1);
         if (buffer == NULL) {
             return Result<String>::Err("Out of memory");
         }
@@ -162,7 +164,7 @@ impl File {
         buffer[read] = 0;
         
         let s = String::new(buffer);
-        _z_fs_free(buffer);
+        free(buffer);
         
         let res = Result<String>::Ok(s);
         s.forget();
@@ -248,7 +250,7 @@ impl File {
         }
         
         let entries = Vec<DirEntry>::new();
-        let name_buf: char* = _z_fs_malloc(256);
+        let name_buf: char* = malloc(256);
         
         if (name_buf == NULL) {
             _z_fs_closedir(dir);
@@ -277,7 +279,7 @@ impl File {
             ent.name.forget();
         }
         
-        _z_fs_free(name_buf);
+        free(name_buf);
         _z_fs_closedir(dir);
         
         let res = Result< Vec<DirEntry> >::Ok(entries);