Merge pull request #72 from bjorn3/couple_of_fixes

Couple of fixes
bjorn3 · Apr 8, 2024 · aba1aa4 · aba1aa4
2 parents 04004aa + d915a01
commit aba1aa4
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 4 deletions.
diff --git a/src/fd.ts b/src/fd.ts
@@ -1,9 +1,9 @@
 /* eslint @typescript-eslint/no-unused-vars:0 */
 import * as wasi from "./wasi_defs.js";
 
-export class Fd {
+export abstract class Fd {
   fd_advise(offset: bigint, len: bigint, advice: number): number {
-    return wasi.ERRNO_NOTSUP;
+    return wasi.ERRNO_SUCCESS;
   }
   fd_allocate(offset: bigint, len: bigint): number {
     return wasi.ERRNO_NOTSUP;

diff --git a/src/fs_core.ts b/src/fs_core.ts
@@ -11,10 +11,37 @@ export class OpenFile extends Fd {
     this.file = file;
   }
 
+  fd_allocate(offset: bigint, len: bigint): number {
+    if (this.file.size > offset + len) {
+      // already big enough
+    } else {
+      // extend
+      const new_data = new Uint8Array(Number(offset + len));
+      new_data.set(this.file.data, 0);
+      this.file.data = new_data;
+    }
+    return wasi.ERRNO_SUCCESS;
+  }
+
   fd_fdstat_get(): { ret: number; fdstat: wasi.Fdstat | null } {
     return { ret: 0, fdstat: new wasi.Fdstat(wasi.FILETYPE_REGULAR_FILE, 0) };
   }
 
+  fd_filestat_set_size(size: bigint): number {
+    if (this.file.size > size) {
+      // truncate
+      this.file.data = new Uint8Array(
+        this.file.data.buffer.slice(0, Number(size)),
+      );
+    } else {
+      // extend
+      const new_data = new Uint8Array(Number(size));
+      new_data.set(this.file.data, 0);
+      this.file.data = new_data;
+    }
+    return wasi.ERRNO_SUCCESS;
+  }
+
   fd_read(
     view8: Uint8Array,
     iovs: Array<wasi.Iovec>,
@@ -147,6 +174,16 @@ export class OpenSyncOPFSFile extends Fd {
     this.file = file;
   }
 
+  fd_allocate(offset: bigint, len: bigint): number {
+    if (BigInt(this.file.handle.getSize()) > offset + len) {
+      // already big enough
+    } else {
+      // extend
+      this.file.handle.truncate(Number(offset + len));
+    }
+    return wasi.ERRNO_SUCCESS;
+  }
+
   fd_fdstat_get(): { ret: number; fdstat: wasi.Fdstat | null } {
     return { ret: 0, fdstat: new wasi.Fdstat(wasi.FILETYPE_REGULAR_FILE, 0) };
   }
@@ -161,6 +198,11 @@ export class OpenSyncOPFSFile extends Fd {
     };
   }
 
+  fd_filestat_set_size(size: bigint): number {
+    this.file.handle.truncate(Number(size));
+    return wasi.ERRNO_SUCCESS;
+  }
+
   fd_read(
     view8: Uint8Array,
     iovs: Array<wasi.Iovec>,
@@ -242,6 +284,11 @@ export class OpenDirectory extends Fd {
     this.dir = dir;
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  fd_seek(offset: bigint, whence: number): { ret: number; offset: bigint } {
+    return { ret: wasi.ERRNO_ISDIR, offset: 0n };
+  }
+
   fd_fdstat_get(): { ret: number; fdstat: wasi.Fdstat | null } {
     return { ret: 0, fdstat: new wasi.Fdstat(wasi.FILETYPE_DIRECTORY, 0) };
   }

diff --git a/test/skip.json b/test/skip.json
@@ -10,7 +10,6 @@
   "WASI Rust tests": {
     "sched_yield": "not implemented yet",
     "path_rename": "fail",
-    "fd_advise": "fail",
     "path_exists": "fail",
     "path_open_dirfd_not_dir": "fail",
     "fd_filestat_set": "fail",
@@ -32,7 +31,6 @@
     "nofollow_errors": "fail",
     "path_open_preopen": "fail",
     "fd_readdir": "fail",
-    "directory_seek": "fail",
     "symlink_filestat": "fail",
     "symlink_loop": "fail",
     "interesting_paths": "fail"