Include support for euidaccess/eaccess (#22455)

Fixes: #22392
emscripten-core · Aug 27, 2024 · e7883d5 · e7883d5
1 parent 646bc43
commit e7883d5
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 3 deletions.
diff --git a/src/library_syscall.js b/src/library_syscall.js
@@ -950,7 +950,7 @@ var SyscallsLibrary = {
 #endif
     path = SYSCALLS.getStr(path);
 #if ASSERTIONS
-    assert(flags === 0);
+    assert(flags === 0 || flags == {{{ cDefs.AT_EACCESS }}});
 #endif
     path = SYSCALLS.calculateAt(dirfd, path);
     if (amode & ~{{{ cDefs.S_IRWXO }}}) {

diff --git a/src/struct_info.json b/src/struct_info.json
@@ -99,6 +99,7 @@
             "F_DUPFD",
             "F_SETLK",
             "O_WRONLY",
+            "AT_EACCESS",
             "AT_FDCWD",
             "AT_SYMLINK_NOFOLLOW",
             "AT_REMOVEDIR",

diff --git a/src/struct_info_generated.json b/src/struct_info_generated.json
@@ -39,6 +39,7 @@
         "AL_VELOCITY": 4102,
         "ATOMICS_WAIT_NOT_EQUAL": 1,
         "ATOMICS_WAIT_TIMED_OUT": 2,
+        "AT_EACCESS": 512,
         "AT_EMPTY_PATH": 4096,
         "AT_FDCWD": -100,
         "AT_NO_AUTOMOUNT": 2048,

diff --git a/src/struct_info_generated_wasm64.json b/src/struct_info_generated_wasm64.json
@@ -39,6 +39,7 @@
         "AL_VELOCITY": 4102,
         "ATOMICS_WAIT_NOT_EQUAL": 1,
         "ATOMICS_WAIT_TIMED_OUT": 2,
+        "AT_EACCESS": 512,
         "AT_EMPTY_PATH": 4096,
         "AT_FDCWD": -100,
         "AT_NO_AUTOMOUNT": 2048,

diff --git a/test/other/test_err.cpp → test/other/test_err.c b/test/other/test_err.cpp → test/other/test_err.c
diff --git a/test/other/test_euidaccess.c b/test/other/test_euidaccess.c
@@ -0,0 +1,10 @@
+#define _GNU_SOURCE
+
+#include <unistd.h>
+#include <stdio.h>
+
+int main() {
+  printf("eaccess:%d\n", eaccess(".", F_OK));
+  printf("euidaccess:%d\n", euidaccess(".", F_OK));
+  return 0;
+}
diff --git a/test/other/test_euidaccess.out b/test/other/test_euidaccess.out
@@ -0,0 +1,2 @@
+eaccess:0
+euidaccess:0
diff --git a/test/test_other.py b/test/test_other.py
@@ -12407,7 +12407,10 @@ def test_deterministic(self):
     self.assertIdentical(one, two)
 
   def test_err(self):
-    self.do_other_test('test_err.cpp')
+    self.do_other_test('test_err.c')
+
+  def test_euidaccess(self):
+    self.do_other_test('test_euidaccess.c')
 
   def test_shared_flag(self):
     # Test that `-shared` flag causes object file generation but gives a warning

diff --git a/tools/system_libs.py b/tools/system_libs.py
@@ -1235,7 +1235,7 @@ def get_files(self):
         ])
     libc_files += files_in_path(
         path='system/lib/libc/musl/src/legacy',
-        filenames=['getpagesize.c', 'err.c'])
+        filenames=['getpagesize.c', 'err.c', 'euidaccess.c'])
 
     libc_files += files_in_path(
         path='system/lib/libc/musl/src/linux',