Merge branch 'main' into chmod-not-update-mtim

hoodmane · hoodmane · commit 4286b2afe3d7 · 2024-11-27T20:49:31.000+01:00
diff --git a/src/library_fs.js b/src/library_fs.js
@@ -673,6 +673,29 @@ FS.staticInit();
       }
       return parent.node_ops.mknod(parent, name, mode, dev);
     },
+    statfs(path) {
+
+      // NOTE: None of the defaults here are true. We're just returning safe and
+      //       sane values.
+      var rtn = {
+        bsize: 4096,
+        frsize: 4096,
+        blocks: 1e6,
+        bfree: 5e5,
+        bavail: 5e5,
+        files: FS.nextInode,
+        ffree: FS.nextInode - 1,
+        fsid: 42,
+        flags: 2,
+        namelen: 255,
+      };
+
+      var parent = FS.lookupPath(path, {follow: true}).node;
+      if (parent?.node_ops.statfs) {
+        Object.assign(rtn, parent.node_ops.statfs(parent.mount.opts.root));
+      }
+      return rtn;
+    },
     // helpers to create specific types of nodes
     create(path, mode = 0o666) {
       mode &= {{{ cDefs.S_IALLUGO }}};
@@ -814,7 +837,7 @@ FS.staticInit();
       // do the underlying fs rename
       try {
         old_dir.node_ops.rename(old_node, new_dir, new_name);
-        // update old node (we do this here to avoid each backend 
+        // update old node (we do this here to avoid each backend
         // needing to)
         old_node.parent = new_dir;
       } catch (e) {
@@ -909,7 +932,7 @@ FS.staticInit();
       if (!link.node_ops.readlink) {
         throw new FS.ErrnoError({{{ cDefs.EINVAL }}});
       }
-      return PATH_FS.resolve(FS.getPath(link.parent), link.node_ops.readlink(link));
+      return link.node_ops.readlink(link);
     },
     stat(path, dontFollow) {
       var lookup = FS.lookupPath(path, { follow: !dontFollow });
@@ -1386,7 +1409,7 @@ FS.staticInit();
       FS.mkdir('/proc/self/fd');
       FS.mount({
         mount() {
-          var node = FS.createNode(proc_self, 'fd', {{{ cDefs.S_IFDIR }}} | {{{ 0777 }}}, {{{ cDefs.S_IXUGO }}});
+          var node = FS.createNode(proc_self, 'fd', {{{ cDefs.S_IFDIR | 0o777 }}}, {{{ cDefs.S_IXUGO }}});
           node.node_ops = {
             lookup(parent, name) {
               var fd = +name;
diff --git a/src/library_lz4.js b/src/library_lz4.js
@@ -8,8 +8,8 @@
 addToLibrary({
   $LZ4__deps: ['$FS', '$preloadPlugins'],
   $LZ4: {
-    DIR_MODE: {{{ cDefs.S_IFDIR }}} | 511 /* 0777 */,
-    FILE_MODE: {{{ cDefs.S_IFREG }}} | 511 /* 0777 */,
+    DIR_MODE: {{{ cDefs.S_IFDIR | 0o777 }}},
+    FILE_MODE: {{{ cDefs.S_IFREG | 0o777 }}},
     CHUNK_SIZE: -1,
     codec: null,
     init() {
diff --git a/src/library_memfs.js b/src/library_memfs.js
@@ -18,7 +18,7 @@ addToLibrary({
   $MEMFS: {
     ops_table: null,
     mount(mount) {
-      return MEMFS.createNode(null, '/', {{{ cDefs.S_IFDIR }}} | 511 /* 0777 */, 0);
+      return MEMFS.createNode(null, '/', {{{ cDefs.S_IFDIR | 0o777 }}}, 0);
     },
     createNode(parent, name, mode, dev) {
       if (FS.isBlkdev(mode) || FS.isFIFO(mode)) {
@@ -230,7 +230,7 @@ addToLibrary({
         return entries;
       },
       symlink(parent, newname, oldpath) {
-        var node = MEMFS.createNode(parent, newname, 511 /* 0777 */ | {{{ cDefs.S_IFLNK }}}, 0);
+        var node = MEMFS.createNode(parent, newname, 0o777 | {{{ cDefs.S_IFLNK }}}, 0);
         node.link = oldpath;
         return node;
       },
diff --git a/src/library_nodefs.js b/src/library_nodefs.js
@@ -220,6 +220,13 @@ addToLibrary({
         var path = NODEFS.realPath(node);
         return NODEFS.tryFSOperation(() => fs.readlinkSync(path));
       },
+      statfs(path) {
+        var stats = NODEFS.tryFSOperation(() => fs.statfsSync(path));
+        // Node.js doesn't provide frsize (fragment size). Set it to bsize (block size)
+        // as they're often the same in many file systems. May not be accurate for all.
+        stats.frsize = stats.bsize;
+        return stats;
+      }
     },
     stream_ops: {
       open(stream) {
diff --git a/src/library_pipefs.js b/src/library_pipefs.js
@@ -12,7 +12,7 @@ addToLibrary({
     mount(mount) {
       // Do not pollute the real root directory or its child nodes with pipes
       // Looks like it is OK to create another pseudo-root node not linked to the FS.root hierarchy this way
-      return FS.createNode(null, '/', {{{ cDefs.S_IFDIR }}} | 511 /* 0777 */, 0);
+      return FS.createNode(null, '/', {{{ cDefs.S_IFDIR }}} | 0o777, 0);
     },
     createPipe() {
       var pipe = {
diff --git a/src/library_sockfs.js b/src/library_sockfs.js
@@ -41,7 +41,7 @@ addToLibrary({
       SOCKFS.on('close', (fd) => dbg(`websocket: close fd = ${fd}`));
 #endif
 
-      return FS.createNode(null, '/', {{{ cDefs.S_IFDIR }}} | 511 /* 0777 */, 0);
+      return FS.createNode(null, '/', {{{ cDefs.S_IFDIR | 0o777 }}}, 0);
     },
     createSocket(family, type, protocol) {
       type &= ~{{{ cDefs.SOCK_CLOEXEC | cDefs.SOCK_NONBLOCK }}}; // Some applications may pass it; it makes no sense for a single process.
diff --git a/src/library_syscall.js b/src/library_syscall.js
@@ -790,22 +790,20 @@ var SyscallsLibrary = {
   },
 
   __syscall_statfs64: (path, size, buf) => {
-    path = SYSCALLS.getStr(path);
 #if ASSERTIONS
     assert(size === {{{ C_STRUCTS.statfs.__size__ }}});
 #endif
-    // NOTE: None of the constants here are true. We're just returning safe and
-    //       sane values.
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bsize, '4096', 'i32') }}};
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_frsize, '4096', 'i32') }}};
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_blocks, '1000000', 'i32') }}};
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bfree, '500000', 'i32') }}};
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bavail, '500000', 'i32') }}};
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_files, 'FS.nextInode', 'i32') }}};
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_ffree, '1000000', 'i32') }}};
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_fsid, '42', 'i32') }}};
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_flags, '2', 'i32') }}};  // ST_NOSUID
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_namelen, '255', 'i32') }}};
+    var stats = FS.statfs(SYSCALLS.getStr(path));
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bsize, 'stats.bsize', 'i32') }}};
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_frsize, 'stats.bsize', 'i32') }}};
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_blocks, 'stats.blocks', 'i32') }}};
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bfree, 'stats.bfree', 'i32') }}};
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bavail, 'stats.bavail', 'i32') }}};
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_files, 'stats.files', 'i32') }}};
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_ffree, 'stats.ffree', 'i32') }}};
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_fsid, 'stats.fsid', 'i32') }}};
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_flags, 'stats.flags', 'i32') }}};  // ST_NOSUID
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_namelen, 'stats.namelen', 'i32') }}};
     return 0;
   },
   __syscall_fstatfs64__deps: ['__syscall_statfs64'],
diff --git a/src/library_wasmfs.js b/src/library_wasmfs.js
@@ -178,9 +178,8 @@ FS.init();
     rmdir: (path) => FS.handleError(
       withStackSave(() => __wasmfs_rmdir(stringToUTF8OnStack(path)))
     ),
-    open: (path, flags, mode) => withStackSave(() => {
+    open: (path, flags, mode = 0o666) => withStackSave(() => {
       flags = typeof flags == 'string' ? FS_modeStringToFlags(flags) : flags;
-      mode = typeof mode == 'undefined' ? 438 /* 0666 */ : mode;
       var buffer = stringToUTF8OnStack(path);
       var fd = FS.handleError(__wasmfs_open(buffer, flags, mode));
       return { fd : fd };
@@ -449,7 +448,7 @@ FS.init();
     mkdev(path, mode, dev) {
       if (typeof dev === 'undefined') {
         dev = mode;
-        mode = 438 /* 0666 */;
+        mode = 0o666;
       }
 
       var deviceBackend = wasmFSDevices[dev];
@@ -517,7 +516,7 @@ FS.init();
 
   $FS_create__deps: ['$FS_mknod'],
   // Default settings copied from the legacy JS FS API.
-  $FS_create: (path, mode = 438 /* 0666 */) => {
+  $FS_create: (path, mode = 0o666) => {
     mode &= {{{ cDefs.S_IALLUGO }}};
     mode |= {{{ cDefs.S_IFREG }}};
     return FS_mknod(path, mode, 0);
@@ -546,7 +545,7 @@ FS.init();
   },
 
   $FS_mkdir__deps: ['_wasmfs_mkdir'],
-  $FS_mkdir: (path, mode = 511 /* 0777 */) => FS.handleError(withStackSave(() => {
+  $FS_mkdir: (path, mode = 0o777) => FS.handleError(withStackSave(() => {
     var buffer = stringToUTF8OnStack(path);
     return __wasmfs_mkdir(buffer, mode);
   })),
diff --git a/src/library_workerfs.js b/src/library_workerfs.js
@@ -7,8 +7,8 @@
 addToLibrary({
   $WORKERFS__deps: ['$FS'],
   $WORKERFS: {
-    DIR_MODE: {{{ cDefs.S_IFDIR }}} | 511 /* 0777 */,
-    FILE_MODE: {{{ cDefs.S_IFREG }}} | 511 /* 0777 */,
+    DIR_MODE: {{{ cDefs.S_IFDIR | 0o777 }}},
+    FILE_MODE: {{{ cDefs.S_IFREG | 0o777 }}},
     reader: null,
     mount(mount) {
       assert(ENVIRONMENT_IS_WORKER);
diff --git a/test/code_size/random_printf_wasm.json b/test/code_size/random_printf_wasm.json
@@ -1,6 +1,6 @@
 {
-  "a.html": 12698,
-  "a.html.gz": 6901,
-  "total": 12698,
-  "total_gz": 6901
+  "a.html": 12686,
+  "a.html.gz": 6930,
+  "total": 12686,
+  "total_gz": 6930
 }
diff --git a/test/code_size/random_printf_wasm2js.json b/test/code_size/random_printf_wasm2js.json
@@ -1,6 +1,6 @@
 {
-  "a.html": 17276,
-  "a.html.gz": 7511,
-  "total": 17276,
-  "total_gz": 7511
+  "a.html": 17266,
+  "a.html.gz": 7510,
+  "total": 17266,
+  "total_gz": 7510
 }
diff --git a/test/core/test_statvfs.c b/test/core/test_statvfs.c
@@ -8,10 +8,13 @@
 #include <stdio.h>
 #include <errno.h>
 #include <sys/statvfs.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 int main() {
   struct statvfs s;
 
+  mkdir("/test", S_IRWXU | S_IRWXG | S_IRWXO);
   printf("result: %d\n", statvfs("/test", &s));
   printf("errno: %d\n", errno);
 
@@ -21,8 +24,8 @@ int main() {
   printf("f_bfree: %u\n", s.f_bfree);
   printf("f_bavail: %u\n", s.f_bavail);
   printf("f_files: %d\n", s.f_files > 5);
-  printf("f_ffree: %u\n", s.f_ffree);
-  printf("f_favail: %u\n", s.f_favail);
+  printf("f_ffree: %u\n", s.f_ffree <= s.f_files && s.f_ffree > 0);
+  printf("f_favail: %u\n", s.f_favail <= s.f_files && s.f_favail > 0);
   printf("f_fsid: %lu\n", s.f_fsid);
   printf("f_flag: %lu\n", s.f_flag);
   printf("f_namemax: %lu\n", s.f_namemax);
diff --git a/test/core/test_statvfs.out b/test/core/test_statvfs.out
@@ -6,8 +6,8 @@ f_blocks: 1000000
 f_bfree: 500000
 f_bavail: 500000
 f_files: 1
-f_ffree: 1000000
-f_favail: 1000000
+f_ffree: 1
+f_favail: 1
 f_fsid: 42
 f_flag: 2
 f_namemax: 255
diff --git a/test/fs/test_nodefs_statvfs.c b/test/fs/test_nodefs_statvfs.c
@@ -0,0 +1,35 @@
+#include <assert.h>
+#include <stdio.h>
+#include <sys/statvfs.h>
+#include <emscripten.h>
+
+void test_statvfs(const char *path) {
+  printf("Testing statfs for path: %s\n", path);
+  struct statvfs st;
+  int result = statvfs(path, &st);
+
+  assert(result == 0 && "statvfs should succeed");
+
+  // Basic sanity checks
+  assert(st.f_bsize > 0 && "Block size should be positive");
+  assert(st.f_blocks > 0 && "Total blocks should be positive");
+  assert(st.f_bfree <= st.f_blocks && "Free blocks should not exceed total blocks");
+  assert(st.f_bavail <= st.f_bfree && "Available blocks should not exceed free blocks");
+  assert(st.f_files >= 0 && "Total inodes should be 0 or positive");
+  assert(st.f_ffree <= st.f_files && "Free inodes should not exceed total inodes");
+}
+
+void setup() {
+  EM_ASM(
+    FS.mkdir('/working');
+    FS.mount(NODEFS, { root: '.' }, '/working');
+  );
+}
+
+int main() {
+  setup();
+  // Test the root filesystem (which should be MEMFS by default)
+  test_statvfs("/");
+  test_statvfs("/working");
+  puts("success");
+}
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.gzsize b/test/other/codesize/test_codesize_cxx_ctors1.gzsize
@@ -1 +1 @@
-8442
+8434
diff --git a/test/other/codesize/test_codesize_cxx_ctors1.jssize b/test/other/codesize/test_codesize_cxx_ctors1.jssize
@@ -1 +1 @@
-20762
+20732
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.gzsize b/test/other/codesize/test_codesize_cxx_ctors2.gzsize
@@ -1 +1 @@
-8428
+8417
diff --git a/test/other/codesize/test_codesize_cxx_ctors2.jssize b/test/other/codesize/test_codesize_cxx_ctors2.jssize
@@ -1 +1 @@
-20730
+20700
diff --git a/test/other/codesize/test_codesize_cxx_except.gzsize b/test/other/codesize/test_codesize_cxx_except.gzsize
@@ -1 +1 @@
-9468
+9465
diff --git a/test/other/codesize/test_codesize_cxx_except.jssize b/test/other/codesize/test_codesize_cxx_except.jssize
@@ -1 +1 @@
-24605
+24575
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm.gzsize
@@ -1 +1 @@
-8410
+8404
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm.jssize b/test/other/codesize/test_codesize_cxx_except_wasm.jssize
@@ -1 +1 @@
-20656
+20626
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.gzsize
@@ -1 +1 @@
-8410
+8404
diff --git a/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize b/test/other/codesize/test_codesize_cxx_except_wasm_exnref.jssize
@@ -1 +1 @@
-20656
+20626
diff --git a/test/other/codesize/test_codesize_cxx_lto.gzsize b/test/other/codesize/test_codesize_cxx_lto.gzsize
@@ -1 +1 @@
-8342
+8333
diff --git a/test/other/codesize/test_codesize_cxx_lto.jssize b/test/other/codesize/test_codesize_cxx_lto.jssize
@@ -1 +1 @@
-20341
+20311
diff --git a/test/other/codesize/test_codesize_cxx_lto.size b/test/other/codesize/test_codesize_cxx_lto.size
@@ -1 +1 @@
-122471
+121982
diff --git a/test/other/codesize/test_codesize_cxx_mangle.gzsize b/test/other/codesize/test_codesize_cxx_mangle.gzsize
@@ -1 +1 @@
-9472
+9467
diff --git a/test/other/codesize/test_codesize_cxx_mangle.jssize b/test/other/codesize/test_codesize_cxx_mangle.jssize
@@ -1 +1 @@
-24605
+24575
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.gzsize b/test/other/codesize/test_codesize_cxx_noexcept.gzsize
@@ -1 +1 @@
-8442
+8434
diff --git a/test/other/codesize/test_codesize_cxx_noexcept.jssize b/test/other/codesize/test_codesize_cxx_noexcept.jssize
@@ -1 +1 @@
-20762
+20732
diff --git a/test/other/codesize/test_codesize_files_js_fs.gzsize b/test/other/codesize/test_codesize_files_js_fs.gzsize
@@ -1 +1 @@
-7580
+7574
diff --git a/test/other/codesize/test_codesize_files_js_fs.jssize b/test/other/codesize/test_codesize_files_js_fs.jssize
@@ -1 +1 @@
-18670
+18641
diff --git a/test/stat/test_chmod.c b/test/stat/test_chmod.c
@@ -32,9 +32,6 @@ void setup() {
   create_file("file", "abcdef", 0777);
   create_file("otherfile", "abcdef", 0777);
   symlink("file", "file-link");
-  // some platforms use 777, some use 755 by default for symlinks
-  // make sure we're using 777 for the test
-  lchmod("file-link", 0777);
   mkdir("folder", 0777);
 }
 
@@ -122,6 +119,10 @@ void test() {
   assert(s.st_mtime == lastmtime);
 
 #ifndef WASMFS // TODO https://github.com/emscripten-core/emscripten/issues/15948
+  lstat("file-link", &s);
+  int link_mode = s.st_mode;
+  assert((link_mode & 0777) != S_IRUSR);
+
   //
   // chmod a symlink's target
   //
@@ -134,7 +135,7 @@ void test() {
 
   // but the link didn't
   lstat("file-link", &s);
-  assert(s.st_mode == (0777 | S_IFLNK));
+  assert(s.st_mode == link_mode);
 
   //
   // chmod the actual symlink
diff --git a/test/test_core.py b/test/test_core.py
diff --git a/test/unistd/links.c b/test/unistd/links.c
diff --git a/tools/emscripten.py b/tools/emscripten.py

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "a.html": 12698,`
`3`		`- "a.html.gz": 6901,`
`4`		`- "total": 12698,`
`5`		`- "total_gz": 6901`
	`2`	`+ "a.html": 12686,`
	`3`	`+ "a.html.gz": 6930,`
	`4`	`+ "total": 12686,`
	`5`	`+ "total_gz": 6930`
`6`	`6`	`}`