@ai-ecoverse/slicc-kernel 1.110.7 → 1.110.8

package/README.md

@@ -1106,6 +1106,14 @@ A threaded WASIX C program for `test/integration/thread-signal.test.mjs` (#520).
 
 **Build:** `WASIX_SYSROOT_28=/path/to/wasix-sysroot ./build.sh`, with `wasixcc` 0.4.7 (`-pthread`) and binaryen's `wasm-opt` on `PATH`. `bin/sigthread.wasm` is 44,788 bytes, sha256 `5781fa39d0a0032cd9b214b71de1f15f589b40e4cecd6862362048dd27f0db56`.
 
+### `fdalias`
+
+A WASIX C program for `test/integration/fd-alias.test.mjs` (#894).
+- `fdalias PATH...` prints, for each path, what `stat`, `lstat` and `readlink` give: a file type (`fifo`, `chr`, `reg`, `lnk`, `dir`, `sock`) or the error. A `pipe:[N]`/`socket:[N]` link is cut after the `[`, so the inode number doesn't enter the expected output.
+- `fdalias cat PATH` opens the path and prints what one read returns.
+
+**Build:** `WASIX_SYSROOT_28=/path/to/wasix-sysroot ./build.sh`, with `wasixcc` 0.4.7 and binaryen's `wasm-opt` on `PATH`. `bin/fdalias.wasm` is 46,260 bytes, sha256 `70412137fb34d310f8ad200345557490d0441acce4e8f917a7ad37094efb70ec`.
+
 ### `spintest`
 
 A WASIX C program and a JS command for `test/integration/transport-spin.test.mjs`, which guards the sync transport's paths from #856 (#864).

package/dist/kernel-worker.js

@@ -6176,7 +6176,7 @@ function satisfies(version, range2) {
 }
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.110.7" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.110.8" : "0.0.0-dev";
 var OS_RELEASE = "6.0.0-slicc";
 function procVersion() {
   return `Linux version ${OS_RELEASE} (slicc-kernel ${KERNEL_VERSION}) #1 SMP PREEMPT_DYNAMIC

package/dist/node-process-worker.js

@@ -3664,7 +3664,7 @@ function wrap(table) {
   }
   return out;
 }
-var WasiExit, IDS, NS_PER_MS4, AT_SYMLINK_NOFOLLOW, AT_EACCESS, ROOT_IDS, GONE, S_IFIFO, DEFAULT_UMASK, MONOTONIC_BASE, MAX_READ, SIGPIPE_EXIT, SIG_IGN, SEALED_MODE, WasiHost;
+var WasiExit, IDS, NS_PER_MS4, AT_SYMLINK_NOFOLLOW, AT_EACCESS, ROOT_IDS, GONE, S_IFIFO, S_IFLNK, DEFAULT_UMASK, MONOTONIC_BASE, MAX_READ, FD_ALIAS, STDIO_FDS, SIGPIPE_EXIT, SIG_IGN, SEALED_MODE, WasiHost;
 var init_wasi_host = __esm({
   "src/process/wasi/wasi-host.ts"() {
     "use strict";
@@ -3699,9 +3699,12 @@ var init_wasi_host = __esm({
     ROOT_IDS = Object.freeze({ uid: 0, gid: 0 });
     GONE = /* @__PURE__ */ new Set(["ENOENT", "ENOTDIR"]);
     S_IFIFO = 4096;
+    S_IFLNK = 40960;
     DEFAULT_UMASK = 18;
     MONOTONIC_BASE = BigInt(Math.round(performance.timeOrigin)) * NS_PER_MS4;
     MAX_READ = 1024 * 1024;
+    FD_ALIAS = /^\/(?:dev\/(stdin|stdout|stderr)|dev\/fd\/(\d+)|proc\/(self|[1-9]\d*)\/fd\/(\d+))$/;
+    STDIO_FDS = { stdin: 0, stdout: 1, stderr: 2 };
     SIGPIPE_EXIT = 128 + SIG.PIPE;
     SIG_IGN = 1;
     SEALED_MODE = 8630;
@@ -3814,7 +3817,20 @@ var init_wasi_host = __esm({
             return void 0;
           }
         };
+        const fdMode = (fd) => {
+          const e = fds.get(fd);
+          const kind = e.type === "kernel" ? fds.kind(fd, e) : void 0;
+          if (kind === "stream") return S_IFIFO | 384;
+          if (kind === "sealed" || kind === "clipboard") return SEALED_MODE;
+          return modeOf2(this.o.fs.stat(pathOf(fd)));
+        };
         const pathOwned = (path, follow2) => {
+          const alias = this.fdAlias(path);
+          if (alias && !follow2) return alias.stdio ? ROOT_IDS : void 0;
+          if (alias) {
+            this.openFd(alias.fd);
+            return fdOwned(alias.fd);
+          }
           if (this.synthetic(path)) return ROOT_IDS;
           return follow2 ? this.o.fs.stat(path) : this.o.fs.lstat(path);
         };
@@ -3864,14 +3880,18 @@ var init_wasi_host = __esm({
             const old = this.o.kernel.call({ op: "proc-umask", mask });
             mem.view().setUint32(out, old, true);
           },
-          fd_mode: (fd, out) => {
-            const e = fds.get(fd);
-            const kind = e.type === "kernel" ? fds.kind(fd, e) : void 0;
-            const mode = kind === "stream" ? S_IFIFO | 384 : kind === "sealed" || kind === "clipboard" ? SEALED_MODE : modeOf2(this.o.fs.stat(pathOf(fd)));
-            mem.view().setUint32(out, mode, true);
-          },
+          fd_mode: (fd, out) => void mem.view().setUint32(out, fdMode(fd), true),
           path_mode: (dirfd, p, l, flags, out) => {
             const path = at(dirfd, p, l);
+            const alias = this.fdAlias(path);
+            if (alias && flags & AT_SYMLINK_NOFOLLOW) {
+              this.fdTarget(alias);
+              return void mem.view().setUint32(out, S_IFLNK | 511, true);
+            }
+            if (alias) {
+              this.openFd(alias.fd);
+              return void mem.view().setUint32(out, fdMode(alias.fd), true);
+            }
             if (this.synthetic(path) && deviceOf(path) === void 0)
               return void mem.view().setUint32(out, SEALED_MODE, true);
             const st = flags & AT_SYMLINK_NOFOLLOW ? this.o.fs.lstat(path) : this.o.fs.stat(path);
@@ -4166,7 +4186,10 @@ var init_wasi_host = __esm({
           path_open: (dirfd, lookup2, p, l, oflags, rights, _inheriting, fdflags, out) => {
             const follow2 = (lookup2 & LOOKUP_SYMLINK_FOLLOW) !== 0;
             try {
-              const path = at(dirfd, p, l);
+              const asked = at(dirfd, p, l);
+              const alias = this.fdAlias(asked);
+              if (alias && !alias.stdio) this.openFd(alias.fd);
+              const path = alias && !alias.stdio ? `/dev/fd/${alias.fd}` : asked;
               if (deviceOf(path)) this.interrupted?.();
               const fresh = (oflags & OFLAGS.CREAT) !== 0 && !this.synthetic(path) && !o.fs.exists(path);
               mem.view().setUint32(out, fds.open(path, oflags, rights, fdflags), true);
@@ -4228,7 +4251,9 @@ var init_wasi_host = __esm({
             o.fs.symlink(mem.string(tp, tl), path);
           },
           path_readlink: (dirfd, p, l, buf, len, used) => {
-            const target = new TextEncoder().encode(o.fs.readlink(at(dirfd, p, l)));
+            const path = at(dirfd, p, l);
+            const alias = this.fdAlias(path);
+            const target = new TextEncoder().encode(alias ? this.fdTarget(alias) : o.fs.readlink(path));
             const n = Math.min(len, target.length);
             mem.bytes(buf, n).set(target.subarray(0, n));
             mem.view().setUint32(used, n, true);
@@ -4567,7 +4592,55 @@ var init_wasi_host = __esm({
           return void 0;
         }
       }
+      fdAlias(path) {
+        const m = FD_ALIAS.exec(path);
+        if (!m) return void 0;
+        if (m[1]) return { fd: STDIO_FDS[m[1]], stdio: true };
+        if (m[3] !== void 0 && m[3] !== "self" && Number(m[3]) !== this.o.pid) return void 0;
+        return { fd: Number(m[2] ?? m[4]), stdio: false };
+      }
+      openFd(fd) {
+        try {
+          this.fds.get(fd);
+        } catch {
+          throw new WasiError("ENOENT");
+        }
+      }
+      fdTarget(alias) {
+        if (alias.stdio) return `/proc/self/fd/${alias.fd}`;
+        this.openFd(alias.fd);
+        const e = this.fds.get(alias.fd);
+        if (e.type === "file") return e.file.path;
+        if (e.type === "dir") return e.path;
+        if (e.type === "device") return `/dev/${e.device}`;
+        const kind = e.type === "kernel" ? this.fds.kind(alias.fd, e) : void 0;
+        if (kind === "file") {
+          const vfs = this.kernelStat(alias.fd);
+          if (vfs.path) return vfs.path;
+        }
+        if (kind === "tty") return "/dev/tty";
+        if (kind === "device") return "/dev/null";
+        const ino = this.fdFilestat(alias.fd).ino;
+        if (kind === "stream") return `pipe:[${ino}]`;
+        if (kind === "socket") return `socket:[${ino}]`;
+        return `anon_inode:[${kind ?? "fd"}]`;
+      }
+      aliasFilestat(path, alias, lookup2) {
+        if ((lookup2 & LOOKUP_SYMLINK_FOLLOW) === 0) {
+          const target = this.fdTarget(alias);
+          return this.local({
+            filetype: FILETYPE.SYMBOLIC_LINK,
+            size: BigInt(new TextEncoder().encode(target).length),
+            ino: pathInode(path),
+            mtimeNs: 0n
+          });
+        }
+        this.openFd(alias.fd);
+        return this.fdFilestat(alias.fd);
+      }
       pathFilestat(path, lookup2) {
+        const alias = this.fdAlias(path);
+        if (alias) return this.aliasFilestat(path, alias, lookup2);
         if (this.synthetic(path)) {
           return this.local({
             filetype: FILETYPE.CHARACTER_DEVICE,
@@ -5212,7 +5285,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.110.7" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.110.8" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -7250,7 +7323,7 @@ function exactIn(node) {
   return node?.mount.opts.bridge.owners === true;
 }
 function modeFromStat(st, exact = false) {
-  const type = st.isSymbolicLink ? S_IFLNK : st.isDirectory ? S_IFDIR : st.isSocket ? S_IFSOCK : S_IFREG;
+  const type = st.isSymbolicLink ? S_IFLNK2 : st.isDirectory ? S_IFDIR : st.isSocket ? S_IFSOCK : S_IFREG;
   const fallback = st.isDirectory || st.isSymbolicLink ? 511 : 438;
   const perm = (st.mode ?? fallback) & PERM_MASK;
   return type | (exact ? perm : perm || fallback);
@@ -8277,7 +8350,7 @@ function readingLinks(Fs) {
     }
   };
 }
-var S_IFDIR, S_IFREG, S_IFLNK, S_IFSOCK, S_IFMT2, PERM_MASK, DEFAULT_DIR_PERM, UMASK, SEEK_CUR2, SEEK_END2, EARLY_WHOLE_FILE, O_APPEND4, O_ACCMODE, O_TRUNC, O_PATH, stale, opening;
+var S_IFDIR, S_IFREG, S_IFLNK2, S_IFSOCK, S_IFMT2, PERM_MASK, DEFAULT_DIR_PERM, UMASK, SEEK_CUR2, SEEK_END2, EARLY_WHOLE_FILE, O_APPEND4, O_ACCMODE, O_TRUNC, O_PATH, stale, opening;
 var init_live_vfs_fs = __esm({
   "src/realm/live-vfs-fs.ts"() {
     "use strict";
@@ -8289,7 +8362,7 @@ var init_live_vfs_fs = __esm({
     init_sync_sab_bridge();
     S_IFDIR = 16384;
     S_IFREG = 32768;
-    S_IFLNK = 40960;
+    S_IFLNK2 = 40960;
     S_IFSOCK = 49152;
     S_IFMT2 = 61440;
     PERM_MASK = 4095;