@ai-ecoverse/wasm-emscripten 6.0.9-8 → 6.0.9-9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/wasm-emscripten",
-  "version": "6.0.9-8",
+  "version": "6.0.9-9",
   "description": "Emscripten 6.0.9 for slicc (emcc via wasix-python)",
   "license": "MIT",
   "repository": {
@@ -53,7 +53,7 @@
     "@ai-ecoverse/wasix-python": "^3.14.2-7",
     "@ai-ecoverse/wasm-clang": "24.0.0-9",
     "@ai-ecoverse/wasm-binaryen": "132.0.0-1",
-    "@ai-ecoverse/emscripten-cache": "6.0.9-2",
+    "@ai-ecoverse/emscripten-cache": "6.0.9-3",
     "esbuild-wasm": "0.28.2",
     "typescript": "6.0.3",
     "acorn": "^8.18.0",

package/system/lib/libc/emscripten_libc_stubs.c

@@ -9,8 +9,6 @@
  */
 
 #include <errno.h>
-#include <grp.h>
-#include <pwd.h>
 #include <string.h>
 #include <time.h>
 #include <signal.h>
@@ -72,76 +70,6 @@ weak int clock_getcpuclockid(pid_t pid, clockid_t *clockid) {
   return 0;
 }
 
-// ==========================================================================
-// pwd.h
-// ==========================================================================
-
-struct passwd *getpwnam(const char *name) {
-  errno = ENOENT;
-  return 0;
-}
-
-struct passwd *getpwuid(uid_t uid) {
-  errno = ENOENT;
-  return 0;
-}
-
-weak int getpwnam_r(const char *name, struct passwd *pwd,
-               char *buf, size_t buflen, struct passwd **result) {
-  return ENOENT;
-}
-
-weak int getpwuid_r(uid_t uid, struct passwd *pwd,
-                      char *buf, size_t buflen, struct passwd **result) {
-  return ENOENT;
-}
-
-weak void setpwent(void) {
-}
-
-weak void endpwent(void) {
-}
-
-struct passwd *getpwent(void) {
-  errno = EIO;
-  return NULL;
-}
-
-// ==========================================================================
-// grp.h
-// ==========================================================================
-
-weak struct group *getgrnam(const char *name) {
-  errno = ENOENT;
-  return 0;
-}
-
-weak struct group *getgrgid(gid_t gid) {
-  errno = ENOENT;
-  return 0;
-}
-
-weak int getgrnam_r(const char *name, struct group *grp,
-               char *buf, size_t buflen, struct group **result) {
-  return ENOENT;
-}
-
-weak int getgrgid_r(gid_t gid, struct group *grp,
-               char *buf, size_t buflen, struct group **result) {
-  return ENOENT;
-}
-
-weak struct group *getgrent(void) {
-  errno = EIO;
-  return NULL;
-}
-
-weak void endgrent(void) {
-}
-
-weak void setgrent(void) {
-}
-
 // ==========================================================================
 // sys/file.h
 // ==========================================================================

package/system/lib/libc/musl/arch/emscripten/bits/alltypes.h

@@ -404,15 +404,11 @@ typedef struct __locale_struct * locale_t;
 #endif
 
 
-// Musl uses 128 bytes for sigset_t, presumably for some kind of ABI
-// compatability with the kernel or GLIBC, but in emscripten we can be precise.
-// Since we have _NSIG = 65 which only need 2 `long`s for the bitmask.
-// The signals we support are
-// 1 - 31 - standard POSIX signals (see emscripten/bits/signal.h)
-// 32 - 34 - pthread-specific signals (see pthread_impl.h>
-// 35 - 65 - user-defined RT signals (we don't currently have any test coverage of these).
+// Keep the musl 128-byte sigset_t layout. Emscripten's short two-long
+// bitmask (16 bytes on wasm32) made sizeof(struct sigaction)==20 and broke
+// slicc_sig_mask stride (20 vs 140) against libc's __sig_actions[].
 #if defined(__NEED_sigset_t) && !defined(__DEFINED_sigset_t)
-typedef struct __sigset_t { unsigned long __bits[2]; } sigset_t;
+typedef struct __sigset_t { unsigned long __bits[128/sizeof(long)]; } sigset_t;
 #define __DEFINED_sigset_t
 #endif
 

package/system/lib/libc/musl/src/passwd/getgr_a.c

@@ -131,13 +131,14 @@ int __getgr_a(const char *name, gid_t gid, struct group *gr, char **buf, size_t
 		if (groupbuf[GRMEMCNT]) {
 			mem[0][0] = *buf + groupbuf[GRNAMELEN] + groupbuf[GRPASSWDLEN];
 			for (ptr = mem[0][0], i = 0; ptr != mem[0][0]+grlist_len; ptr++)
-				if (!*ptr)
+				if (!*ptr) {
 					if (i<groupbuf[GRMEMCNT]) {
 						mem[0][++i] = ptr+1;
 					} else {
 						rv = EIO;
 						goto cleanup_f;
 					}
+				}
 			mem[0][i] = 0;
 
 			if (i != groupbuf[GRMEMCNT]) {

package/tools/system_libs.py

@@ -1178,8 +1178,11 @@ class libc(MuslInternalLibrary,
     musl_srcdir = utils.path_from_root('system/lib/libc/musl/src')
 
     # musl modules
+    # SLICC: include musl passwd/ so getpw*/getgr* read /etc/passwd + /etc/group
+    # from the VFS (synthetic files from the shell). Keep getgrouplist/initgroups
+    # excluded below — they need syscalls Emscripten lacks.
     ignore = [
-        'ipc', 'passwd', 'signal', 'sched', 'time', 'linux',
+        'ipc', 'signal', 'sched', 'time', 'linux',
         'aio', 'legacy', 'mq', 'setjmp',
         'ldso', 'malloc',
     ]