Merge branch 'main' into open-broken-link-create

Author: hoodmane

ChangeLog.md

@@ -695,9 +695,9 @@ var SyscallsLibrary = {
     var pos = 0;
     var off = FS.llseek(stream, 0, {{{ cDefs.SEEK_CUR }}});
 
-    var idx = Math.floor(off / struct_size);
-
-    while (idx < stream.getdents.length && pos + struct_size <= count) {
+    var startIdx = Math.floor(off / struct_size);
+    var endIdx = Math.min(stream.getdents.length, startIdx + Math.floor(count/struct_size))
+    for (var idx = startIdx; idx < endIdx; idx++) {
       var id;
       var type;
       var name = stream.getdents[idx];
@@ -711,7 +711,17 @@ var SyscallsLibrary = {
         type = 4; // DT_DIR
       }
       else {
-        var child = FS.lookupNode(stream.node, name);
+        var child;
+        try {
+          child = FS.lookupNode(stream.node, name);
+        } catch (e) {
+          // If the entry is not a directory, file, or symlink, nodefs
+          // lookupNode will raise EINVAL. Skip these and continue.
+          if (e?.errno === {{{ cDefs.EINVAL }}}) {
+            continue;
+          }
+          throw e;
+        }
         id = child.id;
         type = FS.isChrdev(child.mode) ? 2 :  // DT_CHR, character device.
                FS.isDir(child.mode) ? 4 :     // DT_DIR, directory.
@@ -727,7 +737,6 @@ var SyscallsLibrary = {
       {{{ makeSetValue('dirp + pos', C_STRUCTS.dirent.d_type, 'type', 'i8') }}};
       stringToUTF8(name, dirp + pos + {{{ C_STRUCTS.dirent.d_name }}}, 256);
       pos += struct_size;
-      idx += 1;
     }
     FS.llseek(stream, idx * struct_size, {{{ cDefs.SEEK_SET }}});
     return pos;

src/library_syscall.js

@@ -663,7 +663,7 @@ function getBinaryPromise(binaryFile) {
 #endif
 
   // Otherwise, getBinarySync should be able to get it synchronously
-  return Promise.resolve().then(() => getBinarySync(binaryFile));
+  return Promise.resolve(getBinarySync(binaryFile));
 }
 
 #if LOAD_SOURCE_MAP

src/preamble.js

@@ -0,0 +1,13 @@
+listing contents of dir=/
+.
+..
+tmp
+home
+dev
+proc
+listing contents of dir=/working
+existing
+stdout
+test_nodefs_readdir.js
+test_nodefs_readdir.wasm
+success

test/fs/test_nodefs_readdir.out

@@ -0,0 +1,12 @@
+listing contents of dir=/
+.
+..
+tmp
+home
+dev
+proc
+listing contents of dir=/working
+existing
+stdout
+test_nodefs_readdir.js
+success

test/fs/test_nodefs_readdir.wasm2js.out

@@ -0,0 +1,14 @@
+listing contents of dir=/
+.
+..
+dev
+tmp
+listing contents of dir=/working
+.
+..
+existing
+named_pipe
+stdout
+test_nodefs_readdir.js
+test_nodefs_readdir.wasm
+success

test/fs/test_nodefs_readdir.wasmfs.out

@@ -1 +1 @@
-8432
+8430

test/other/codesize/test_codesize_cxx_ctors1.gzsize

@@ -1 +1 @@
-20676
+20665

test/other/codesize/test_codesize_cxx_ctors1.jssize

@@ -1 +1 @@
-8416
+8413

test/other/codesize/test_codesize_cxx_ctors2.gzsize

@@ -1 +1 @@
-20644
+20633