Use correct types for syscalls

kleisauke · kleisauke · commit d1a10c1c6eeb · 2024-01-20T09:18:22.000+01:00
diff --git a/system/lib/libc/emscripten_syscall_stubs.c b/system/lib/libc/emscripten_syscall_stubs.c
@@ -24,10 +24,10 @@
 #include <emscripten/console.h>
 #include <emscripten/version.h>
 
-static int g_pid = 42;
-static int g_pgid = 42;
-static int g_ppid = 1;
-static int g_sid = 42;
+static pid_t g_pid = 42;
+static pid_t g_pgid = 42;
+static pid_t g_ppid = 1;
+static pid_t g_sid = 42;
 static mode_t g_umask = S_IRWXU | S_IRWXG | S_IRWXO;
 
 #ifdef NDEBUG
@@ -68,7 +68,7 @@ weak int __syscall_uname(intptr_t buf) {
   return 0;
 }
 
-weak int __syscall_setpgid(int pid, int pgid) {
+weak int __syscall_setpgid(pid_t pid, pid_t pgid) {
   if (pid && pid != g_pid) {
     return -ESRCH;
   }
@@ -82,46 +82,46 @@ weak int __syscall_sync() {
   return 0;
 }
 
-weak int __syscall_getsid(int pid) {
+weak pid_t __syscall_getsid(pid_t pid) {
   if (pid && pid != g_pid) {
     return -ESRCH;
   }
   return g_sid;
 }
 
-weak int __syscall_getpgid(int pid) {
+weak pid_t __syscall_getpgid(pid_t pid) {
   if (pid && pid != g_pid) {
     return -ESRCH;
   }
   return g_pgid;
 }
 
-weak int __syscall_getpid() {
+weak pid_t __syscall_getpid() {
   return g_pid;
 }
 
-weak int __syscall_getppid() {
+weak pid_t __syscall_getppid() {
   return g_ppid;
 }
 
 weak int __syscall_linkat(int olddirfd, intptr_t oldpath, int newdirfd, intptr_t newpath, int flags) {
   return -EMLINK; // no hardlinks for us
 }
 
-weak int __syscall_getgroups32(int size, intptr_t list) {
-  if (size < 1) {
+weak int __syscall_getgroups32(int count, intptr_t list) {
+  if (count < 1) {
     return -EINVAL;
   }
   ((gid_t*)list)[0] = 0;
   return 1;
 }
 
-weak int __syscall_setsid() {
+weak pid_t __syscall_setsid() {
   return 0; // no-op
 }
 
-weak int __syscall_umask(int mask) {
-  int old = g_umask;
+weak mode_t __syscall_umask(mode_t mask) {
+  mode_t old = g_umask;
   g_umask = mask;
   return old;
 }
@@ -141,31 +141,31 @@ weak int __syscall_getrusage(int who, intptr_t usage) {
   return 0;
 }
 
-weak int __syscall_getpriority(int which, int who) {
+weak int __syscall_getpriority(int which, id_t who) {
   return 0;
 }
 
-weak int __syscall_setpriority(int which, int who, int prio) {
+weak int __syscall_setpriority(int which, id_t who, int prio) {
   return -EPERM;
 }
 
 weak int __syscall_setdomainname(intptr_t name, size_t size) {
   return -EPERM;
 }
 
-weak int __syscall_getuid32(void) {
+weak uid_t __syscall_getuid32(void) {
   return 0;
 }
 
-weak int __syscall_getgid32(void) {
+weak gid_t __syscall_getgid32(void) {
   return 0;
 }
 
-weak int __syscall_geteuid32(void) {
+weak uid_t __syscall_geteuid32(void) {
   return 0;
 }
 
-weak int __syscall_getegid32(void) {
+weak gid_t __syscall_getegid32(void) {
   return 0;
 }
 
@@ -225,7 +225,7 @@ weak int __syscall_munlockall() {
   return 0;
 }
 
-weak int __syscall_prlimit64(int pid, int resource, intptr_t new_limit, intptr_t old_limit) {
+weak int __syscall_prlimit64(pid_t pid, int resource, intptr_t new_limit, intptr_t old_limit) {
   REPORT(prlimit64);
   struct rlimit *old = (struct rlimit *)old_limit;
   if (old) { // just report no limits
@@ -256,4 +256,4 @@ UNIMPLEMENTED(recvmmsg, (int sockfd, intptr_t msgvec, size_t vlen, int flags, ..
 UNIMPLEMENTED(sendmmsg, (int sockfd, intptr_t msgvec, size_t vlen, int flags, ...))
 UNIMPLEMENTED(shutdown, (int sockfd, int how, int dummy, int dummy2, int dummy3, int dummy4))
 UNIMPLEMENTED(socketpair, (int domain, int type, int protocol, intptr_t fds, int dummy, int dummy2))
-UNIMPLEMENTED(wait4,(int pid, intptr_t wstatus, int options, int rusage))
+UNIMPLEMENTED(wait4,(pid_t pid, intptr_t wstatus, int options, int rusage))
diff --git a/system/lib/libc/musl/arch/emscripten/syscall_arch.h b/system/lib/libc/musl/arch/emscripten/syscall_arch.h
@@ -13,9 +13,9 @@ extern "C" {
 #endif
 
 int __syscall_chdir(intptr_t path);
-int __syscall_mknod(intptr_t path, int mode, int dev);
-int __syscall_chmod(intptr_t path, int mode);
-int __syscall_getpid(void);
+int __syscall_mknod(intptr_t path, mode_t mode, dev_t dev);
+int __syscall_chmod(intptr_t path, mode_t mode);
+pid_t __syscall_getpid(void);
 int __syscall_pause(void);
 int __syscall_access(intptr_t path, int amode);
 int __syscall_sync(void);
@@ -24,28 +24,28 @@ int __syscall_dup(int fd);
 int __syscall_pipe(intptr_t fd);
 int __syscall_acct(intptr_t filename);
 int __syscall_ioctl(int fd, int request, ...);
-int __syscall_setpgid(int pid, int gpid);
-int __syscall_umask(int mask);
-int __syscall_getppid(void);
-int __syscall_getpgrp(void);
-int __syscall_setsid(void);
+int __syscall_setpgid(pid_t pid, pid_t gpid);
+mode_t __syscall_umask(mode_t mask);
+pid_t __syscall_getppid(void);
+pid_t __syscall_getpgrp(void);
+pid_t __syscall_setsid(void);
 int __syscall_setrlimit(int resource, intptr_t limit);
 int __syscall_getrusage(int who, intptr_t usage);
 int __syscall_symlink(intptr_t target, intptr_t linkpath);
 int __syscall_munmap(intptr_t addr, size_t len);
-int __syscall_fchmod(int fd, int mode);
-int __syscall_getpriority(int which, int who);
-int __syscall_setpriority(int which, int who, int prio);
+int __syscall_fchmod(int fd, mode_t mode);
+int __syscall_getpriority(int which, id_t who);
+int __syscall_setpriority(int which, id_t who, int prio);
 int __syscall_socketcall(int call, intptr_t args);
-int __syscall_wait4(int pid, intptr_t wstatus, int options, int rusage);
+pid_t __syscall_wait4(pid_t pid, intptr_t wstatus, int options, int rusage);
 int __syscall_setdomainname(intptr_t name, size_t size);
 int __syscall_uname(intptr_t buf);
 int __syscall_mprotect(size_t addr, size_t len, int prot);
-int __syscall_getpgid(int pid);
+pid_t __syscall_getpgid(pid_t pid);
 int __syscall_fchdir(int fd);
 int __syscall__newselect(int nfds, intptr_t readfds, intptr_t writefds, intptr_t exceptfds, intptr_t timeout);
 int __syscall_msync(intptr_t addr, size_t len, int flags);
-int __syscall_getsid(int pid);
+pid_t __syscall_getsid(pid_t pid);
 int __syscall_fdatasync(int fd);
 int __syscall_mlock(intptr_t addr, size_t len);
 int __syscall_munlock(intptr_t addr, size_t len);
@@ -61,20 +61,20 @@ int __syscall_ftruncate64(int fd, off_t length);
 int __syscall_stat64(intptr_t path, intptr_t buf);
 int __syscall_lstat64(intptr_t path, intptr_t buf);
 int __syscall_fstat64(int fd, intptr_t buf);
-int __syscall_getuid32(void);
-int __syscall_getgid32(void);
-int __syscall_geteuid32(void);
-int __syscall_getegid32(void);
-int __syscall_setreuid32(int ruid, int euid);
-int __syscall_setregid32(int rgid, int egid);
-int __syscall_getgroups32(int size, intptr_t list);
-int __syscall_fchown32(int fd, int owner, int group);
-int __syscall_setresuid32(int ruid, int euid, int suid);
+uid_t __syscall_getuid32(void);
+gid_t __syscall_getgid32(void);
+uid_t __syscall_geteuid32(void);
+gid_t __syscall_getegid32(void);
+int __syscall_setreuid32(uid_t ruid, uid_t euid);
+int __syscall_setregid32(gid_t rgid, gid_t egid);
+int __syscall_getgroups32(int count, intptr_t list);
+int __syscall_fchown32(int fd, uid_t owner, gid_t group);
+int __syscall_setresuid32(uid_t ruid, uid_t euid, uid_t suid);
 int __syscall_getresuid32(intptr_t ruid, intptr_t euid, intptr_t suid);
-int __syscall_setresgid32(int rgid, int egid, int sgid);
+int __syscall_setresgid32(gid_t rgid, gid_t egid, gid_t sgid);
 int __syscall_getresgid32(intptr_t rgid, intptr_t egid, intptr_t sgid);
-int __syscall_setuid32(int uid);
-int __syscall_setgid32(int uid);
+int __syscall_setuid32(uid_t uid);
+int __syscall_setgid32(gid_t gid);
 int __syscall_mincore(intptr_t addr, size_t length, intptr_t vec);
 int __syscall_madvise(intptr_t addr, size_t length, int advice);
 int __syscall_getdents64(int fd, intptr_t dirp, size_t count);
@@ -83,24 +83,24 @@ int __syscall_statfs64(intptr_t path, size_t size, intptr_t buf);
 int __syscall_fstatfs64(int fd, size_t size, intptr_t buf);
 int __syscall_fadvise64(int fd, off_t offset, off_t length, int advice);
 int __syscall_openat(int dirfd, intptr_t path, int flags, ...); // mode is optional
-int __syscall_mkdirat(int dirfd, intptr_t path, int mode);
-int __syscall_mknodat(int dirfd, intptr_t path, int mode, int dev);
-int __syscall_fchownat(int dirfd, intptr_t path, int owner, int group, int flags);
+int __syscall_mkdirat(int dirfd, intptr_t path, mode_t mode);
+int __syscall_mknodat(int dirfd, intptr_t path, mode_t mode, dev_t dev);
+int __syscall_fchownat(int dirfd, intptr_t path, uid_t owner, gid_t group, int flags);
 int __syscall_newfstatat(int dirfd, intptr_t path, intptr_t buf, int flags);
 int __syscall_unlinkat(int dirfd, intptr_t path, int flags);
 int __syscall_renameat(int olddirfd, intptr_t oldpath, int newdirfd, intptr_t newpath);
 int __syscall_linkat(int olddirfd, intptr_t oldpath, int newdirfd, intptr_t newpath, int flags);
 int __syscall_symlinkat(intptr_t target, int newdirfd, intptr_t linkpath);
 int __syscall_readlinkat(int dirfd, intptr_t path, intptr_t buf, size_t bufsize);
-int __syscall_fchmodat(int dirfd, intptr_t path, int mode, ...);
+int __syscall_fchmodat(int dirfd, intptr_t path, mode_t mode, ...);
 int __syscall_faccessat(int dirfd, intptr_t path, int amode, int flags);
 int __syscall_pselect6(int nfds, intptr_t readfds, intptr_t writefds, intptr_t exceptfds, intptr_t timeout, intptr_t sigmaks);
 int __syscall_utimensat(int dirfd, intptr_t path, intptr_t times, int flags);
 int __syscall_fallocate(int fd, int mode, off_t offset, off_t len);
 int __syscall_dup3(int fd, int suggestfd, int flags);
 int __syscall_pipe2(intptr_t fds, int flags);
 int __syscall_recvmmsg(int sockfd, intptr_t msgvec, size_t vlen, int flags, ...);
-int __syscall_prlimit64(int pid, int resource, intptr_t new_limit, intptr_t old_limit);
+int __syscall_prlimit64(pid_t pid, int resource, intptr_t new_limit, intptr_t old_limit);
 int __syscall_sendmmsg(int sockfd, intptr_t msgvec, size_t vlen, int flags, ...);
 int __syscall_socket(int domain, int type, int protocol, int dummy1, int dummy2, int dummy3);
 int __syscall_socketpair(int domain, int type, int protocol, intptr_t fds, int dummy, int dummy2);
diff --git a/system/lib/standalone/standalone.c b/system/lib/standalone/standalone.c
@@ -122,7 +122,7 @@ weak int __syscall_dup(int fd) {
   return -ENOSYS;
 }
 
-weak int __syscall_mkdirat(int dirfd, intptr_t path, int mode) {
+weak int __syscall_mkdirat(int dirfd, intptr_t path, mode_t mode) {
   return -ENOSYS;
 }
 
diff --git a/system/lib/wasmfs/js_api.cpp b/system/lib/wasmfs/js_api.cpp
@@ -124,7 +124,7 @@ int _wasmfs_write_file(char* pathname, char* data, size_t data_size) {
   return data_size;
 }
 
-int _wasmfs_mkdir(char* path, int mode) {
+int _wasmfs_mkdir(char* path, mode_t mode) {
   return __syscall_mkdirat(AT_FDCWD, (intptr_t)path, mode);
 }
 
diff --git a/system/lib/wasmfs/syscalls.cpp b/system/lib/wasmfs/syscalls.cpp
@@ -587,7 +587,7 @@ int __syscall_openat(int dirfd, intptr_t path, int flags, ...) {
   return doOpen(path::parseParent((char*)path, dirfd), flags, mode);
 }
 
-int __syscall_mknodat(int dirfd, intptr_t path, int mode, int dev) {
+int __syscall_mknodat(int dirfd, intptr_t path, mode_t mode, dev_t dev) {
   assert(dev == 0); // TODO: support special devices
   if (mode & S_IFDIR) {
     return -EINVAL;
@@ -603,7 +603,7 @@ int __syscall_mknodat(int dirfd, intptr_t path, int mode, int dev) {
 }
 
 static int
-doMkdir(path::ParsedParent parsed, int mode, backend_t backend = NullBackend) {
+doMkdir(path::ParsedParent parsed, mode_t mode, backend_t backend = NullBackend) {
   if (auto err = parsed.getError()) {
     return err;
   }
@@ -660,14 +660,14 @@ doMkdir(path::ParsedParent parsed, int mode, backend_t backend = NullBackend) {
 
 // This function is exposed to users and allows users to specify a particular
 // backend that a directory should be created within.
-int wasmfs_create_directory(char* path, int mode, backend_t backend) {
+int wasmfs_create_directory(char* path, mode_t mode, backend_t backend) {
   static_assert(std::is_same_v<decltype(doMkdir(0, 0, 0)), int>,
                 "unexpected conversion from result of doMkdir to int");
   return doMkdir(path::parseParent(path), mode, backend);
 }
 
 // TODO: Test this.
-int __syscall_mkdirat(int dirfd, intptr_t path, int mode) {
+int __syscall_mkdirat(int dirfd, intptr_t path, mode_t mode) {
   return doMkdir(path::parseParent((char*)path, dirfd), mode);
 }
 
@@ -1163,7 +1163,7 @@ int __syscall_utimensat(int dirFD, intptr_t path_, intptr_t times_, int flags) {
 }
 
 // TODO: Test this with non-AT_FDCWD values.
-int __syscall_fchmodat(int dirfd, intptr_t path, int mode, ...) {
+int __syscall_fchmodat(int dirfd, intptr_t path, mode_t mode, ...) {
   int flags = 0;
   va_list v1;
   va_start(v1, mode);
@@ -1185,11 +1185,11 @@ int __syscall_fchmodat(int dirfd, intptr_t path, int mode, ...) {
   return 0;
 }
 
-int __syscall_chmod(intptr_t path, int mode) {
+int __syscall_chmod(intptr_t path, mode_t mode) {
   return __syscall_fchmodat(AT_FDCWD, path, mode, 0);
 }
 
-int __syscall_fchmod(int fd, int mode) {
+int __syscall_fchmod(int fd, mode_t mode) {
   auto openFile = wasmFS.getFileTable().locked().getEntry(fd);
   if (!openFile) {
     return -EBADF;
@@ -1201,7 +1201,7 @@ int __syscall_fchmod(int fd, int mode) {
 }
 
 int __syscall_fchownat(
-  int dirfd, intptr_t path, int owner, int group, int flags) {
+  int dirfd, intptr_t path, uid_t owner, gid_t group, int flags) {
   // Only accept valid flags.
   if (flags & ~(AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW)) {
     // TODO: Test this case.
@@ -1217,7 +1217,7 @@ int __syscall_fchownat(
   return 0;
 }
 
-int __syscall_fchown32(int fd, int owner, int group) {
+int __syscall_fchown32(int fd, uid_t owner, gid_t group) {
   return __syscall_fchownat(fd, (intptr_t) "", owner, group, AT_EMPTY_PATH);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,10 @@`
`24`	`24`	`#include <emscripten/console.h>`
`25`	`25`	`#include <emscripten/version.h>`
`26`	`26`
`27`		`-static int g_pid = 42;`
`28`		`-static int g_pgid = 42;`
`29`		`-static int g_ppid = 1;`
`30`		`-static int g_sid = 42;`
	`27`	`+static pid_t g_pid = 42;`
	`28`	`+static pid_t g_pgid = 42;`
	`29`	`+static pid_t g_ppid = 1;`
	`30`	`+static pid_t g_sid = 42;`
`31`	`31`	`static mode_t g_umask = S_IRWXU \| S_IRWXG \| S_IRWXO;`
`32`	`32`
`33`	`33`	`#ifdef NDEBUG`
`@@ -68,7 +68,7 @@ weak int __syscall_uname(intptr_t buf) {`
`68`	`68`	`return 0;`
`69`	`69`	`}`
`70`	`70`
`71`		`-weak int __syscall_setpgid(int pid, int pgid) {`
	`71`	`+weak int __syscall_setpgid(pid_t pid, pid_t pgid) {`
`72`	`72`	`if (pid && pid != g_pid) {`
`73`	`73`	`return -ESRCH;`
`74`	`74`	`}`
`@@ -82,46 +82,46 @@ weak int __syscall_sync() {`
`82`	`82`	`return 0;`
`83`	`83`	`}`
`84`	`84`
`85`		`-weak int __syscall_getsid(int pid) {`
	`85`	`+weak pid_t __syscall_getsid(pid_t pid) {`
`86`	`86`	`if (pid && pid != g_pid) {`
`87`	`87`	`return -ESRCH;`
`88`	`88`	`}`
`89`	`89`	`return g_sid;`
`90`	`90`	`}`
`91`	`91`
`92`		`-weak int __syscall_getpgid(int pid) {`
	`92`	`+weak pid_t __syscall_getpgid(pid_t pid) {`
`93`	`93`	`if (pid && pid != g_pid) {`
`94`	`94`	`return -ESRCH;`
`95`	`95`	`}`
`96`	`96`	`return g_pgid;`
`97`	`97`	`}`
`98`	`98`
`99`		`-weak int __syscall_getpid() {`
	`99`	`+weak pid_t __syscall_getpid() {`
`100`	`100`	`return g_pid;`
`101`	`101`	`}`
`102`	`102`
`103`		`-weak int __syscall_getppid() {`
	`103`	`+weak pid_t __syscall_getppid() {`
`104`	`104`	`return g_ppid;`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`weak int __syscall_linkat(int olddirfd, intptr_t oldpath, int newdirfd, intptr_t newpath, int flags) {`
`108`	`108`	`return -EMLINK; // no hardlinks for us`
`109`	`109`	`}`
`110`	`110`
`111`		`-weak int __syscall_getgroups32(int size, intptr_t list) {`
`112`		`- if (size < 1) {`
	`111`	`+weak int __syscall_getgroups32(int count, intptr_t list) {`
	`112`	`+ if (count < 1) {`
`113`	`113`	`return -EINVAL;`
`114`	`114`	`}`
`115`	`115`	`((gid_t*)list)[0] = 0;`
`116`	`116`	`return 1;`
`117`	`117`	`}`
`118`	`118`
`119`		`-weak int __syscall_setsid() {`
	`119`	`+weak pid_t __syscall_setsid() {`
`120`	`120`	`return 0; // no-op`
`121`	`121`	`}`
`122`	`122`
`123`		`-weak int __syscall_umask(int mask) {`
`124`		`- int old = g_umask;`
	`123`	`+weak mode_t __syscall_umask(mode_t mask) {`
	`124`	`+ mode_t old = g_umask;`
`125`	`125`	`g_umask = mask;`
`126`	`126`	`return old;`
`127`	`127`	`}`
`@@ -141,31 +141,31 @@ weak int __syscall_getrusage(int who, intptr_t usage) {`
`141`	`141`	`return 0;`
`142`	`142`	`}`
`143`	`143`
`144`		`-weak int __syscall_getpriority(int which, int who) {`
	`144`	`+weak int __syscall_getpriority(int which, id_t who) {`
`145`	`145`	`return 0;`
`146`	`146`	`}`
`147`	`147`
`148`		`-weak int __syscall_setpriority(int which, int who, int prio) {`
	`148`	`+weak int __syscall_setpriority(int which, id_t who, int prio) {`
`149`	`149`	`return -EPERM;`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`weak int __syscall_setdomainname(intptr_t name, size_t size) {`
`153`	`153`	`return -EPERM;`
`154`	`154`	`}`
`155`	`155`
`156`		`-weak int __syscall_getuid32(void) {`
	`156`	`+weak uid_t __syscall_getuid32(void) {`
`157`	`157`	`return 0;`
`158`	`158`	`}`
`159`	`159`
`160`		`-weak int __syscall_getgid32(void) {`
	`160`	`+weak gid_t __syscall_getgid32(void) {`
`161`	`161`	`return 0;`
`162`	`162`	`}`
`163`	`163`
`164`		`-weak int __syscall_geteuid32(void) {`
	`164`	`+weak uid_t __syscall_geteuid32(void) {`
`165`	`165`	`return 0;`
`166`	`166`	`}`
`167`	`167`
`168`		`-weak int __syscall_getegid32(void) {`
	`168`	`+weak gid_t __syscall_getegid32(void) {`
`169`	`169`	`return 0;`
`170`	`170`	`}`
`171`	`171`
`@@ -225,7 +225,7 @@ weak int __syscall_munlockall() {`
`225`	`225`	`return 0;`
`226`	`226`	`}`
`227`	`227`
`228`		`-weak int __syscall_prlimit64(int pid, int resource, intptr_t new_limit, intptr_t old_limit) {`
	`228`	`+weak int __syscall_prlimit64(pid_t pid, int resource, intptr_t new_limit, intptr_t old_limit) {`
`229`	`229`	`REPORT(prlimit64);`
`230`	`230`	`struct rlimit old = (struct rlimit )old_limit;`
`231`	`231`	`if (old) { // just report no limits`
`@@ -256,4 +256,4 @@ UNIMPLEMENTED(recvmmsg, (int sockfd, intptr_t msgvec, size_t vlen, int flags, ..`
`256`	`256`	`UNIMPLEMENTED(sendmmsg, (int sockfd, intptr_t msgvec, size_t vlen, int flags, ...))`
`257`	`257`	`UNIMPLEMENTED(shutdown, (int sockfd, int how, int dummy, int dummy2, int dummy3, int dummy4))`
`258`	`258`	`UNIMPLEMENTED(socketpair, (int domain, int type, int protocol, intptr_t fds, int dummy, int dummy2))`
`259`		`-UNIMPLEMENTED(wait4,(int pid, intptr_t wstatus, int options, int rusage))`
	`259`	`+UNIMPLEMENTED(wait4,(pid_t pid, intptr_t wstatus, int options, int rusage))`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ weak int __syscall_dup(int fd) {`
`122`	`122`	`return -ENOSYS;`
`123`	`123`	`}`
`124`	`124`
`125`		`-weak int __syscall_mkdirat(int dirfd, intptr_t path, int mode) {`
	`125`	`+weak int __syscall_mkdirat(int dirfd, intptr_t path, mode_t mode) {`
`126`	`126`	`return -ENOSYS;`
`127`	`127`	`}`
`128`	`128`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ int _wasmfs_write_file(char* pathname, char* data, size_t data_size) {`
`124`	`124`	`return data_size;`
`125`	`125`	`}`
`126`	`126`
`127`		`-int _wasmfs_mkdir(char* path, int mode) {`
	`127`	`+int _wasmfs_mkdir(char* path, mode_t mode) {`
`128`	`128`	`return __syscall_mkdirat(AT_FDCWD, (intptr_t)path, mode);`
`129`	`129`	`}`
`130`	`130`
Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ int __syscall_openat(int dirfd, intptr_t path, int flags, ...) {`
`587`	`587`	`return doOpen(path::parseParent((char*)path, dirfd), flags, mode);`
`588`	`588`	`}`
`589`	`589`
`590`		`-int __syscall_mknodat(int dirfd, intptr_t path, int mode, int dev) {`
	`590`	`+int __syscall_mknodat(int dirfd, intptr_t path, mode_t mode, dev_t dev) {`
`591`	`591`	`assert(dev == 0); // TODO: support special devices`
`592`	`592`	`if (mode & S_IFDIR) {`
`593`	`593`	`return -EINVAL;`
`@@ -603,7 +603,7 @@ int __syscall_mknodat(int dirfd, intptr_t path, int mode, int dev) {`
`603`	`603`	`}`
`604`	`604`
`605`	`605`	`static int`
`606`		`-doMkdir(path::ParsedParent parsed, int mode, backend_t backend = NullBackend) {`
	`606`	`+doMkdir(path::ParsedParent parsed, mode_t mode, backend_t backend = NullBackend) {`
`607`	`607`	`if (auto err = parsed.getError()) {`
`608`	`608`	`return err;`
`609`	`609`	`}`
`@@ -660,14 +660,14 @@ doMkdir(path::ParsedParent parsed, int mode, backend_t backend = NullBackend) {`
`660`	`660`
`661`	`661`	`// This function is exposed to users and allows users to specify a particular`
`662`	`662`	`// backend that a directory should be created within.`
`663`		`-int wasmfs_create_directory(char* path, int mode, backend_t backend) {`
	`663`	`+int wasmfs_create_directory(char* path, mode_t mode, backend_t backend) {`
`664`	`664`	`static_assert(std::is_same_v<decltype(doMkdir(0, 0, 0)), int>,`
`665`	`665`	`"unexpected conversion from result of doMkdir to int");`
`666`	`666`	`return doMkdir(path::parseParent(path), mode, backend);`
`667`	`667`	`}`
`668`	`668`
`669`	`669`	`// TODO: Test this.`
`670`		`-int __syscall_mkdirat(int dirfd, intptr_t path, int mode) {`
	`670`	`+int __syscall_mkdirat(int dirfd, intptr_t path, mode_t mode) {`
`671`	`671`	`return doMkdir(path::parseParent((char*)path, dirfd), mode);`
`672`	`672`	`}`
`673`	`673`
`@@ -1163,7 +1163,7 @@ int __syscall_utimensat(int dirFD, intptr_t path_, intptr_t times_, int flags) {`
`1163`	`1163`	`}`
`1164`	`1164`
`1165`	`1165`	`// TODO: Test this with non-AT_FDCWD values.`
`1166`		`-int __syscall_fchmodat(int dirfd, intptr_t path, int mode, ...) {`
	`1166`	`+int __syscall_fchmodat(int dirfd, intptr_t path, mode_t mode, ...) {`
`1167`	`1167`	`int flags = 0;`
`1168`	`1168`	`va_list v1;`
`1169`	`1169`	`va_start(v1, mode);`
`@@ -1185,11 +1185,11 @@ int __syscall_fchmodat(int dirfd, intptr_t path, int mode, ...) {`
`1185`	`1185`	`return 0;`
`1186`	`1186`	`}`
`1187`	`1187`
`1188`		`-int __syscall_chmod(intptr_t path, int mode) {`
	`1188`	`+int __syscall_chmod(intptr_t path, mode_t mode) {`
`1189`	`1189`	`return __syscall_fchmodat(AT_FDCWD, path, mode, 0);`
`1190`	`1190`	`}`
`1191`	`1191`
`1192`		`-int __syscall_fchmod(int fd, int mode) {`
	`1192`	`+int __syscall_fchmod(int fd, mode_t mode) {`
`1193`	`1193`	`auto openFile = wasmFS.getFileTable().locked().getEntry(fd);`
`1194`	`1194`	`if (!openFile) {`
`1195`	`1195`	`return -EBADF;`
`@@ -1201,7 +1201,7 @@ int __syscall_fchmod(int fd, int mode) {`
`1201`	`1201`	`}`
`1202`	`1202`
`1203`	`1203`	`int __syscall_fchownat(`
`1204`		`- int dirfd, intptr_t path, int owner, int group, int flags) {`
	`1204`	`+ int dirfd, intptr_t path, uid_t owner, gid_t group, int flags) {`
`1205`	`1205`	`// Only accept valid flags.`
`1206`	`1206`	`if (flags & ~(AT_EMPTY_PATH \| AT_SYMLINK_NOFOLLOW)) {`
`1207`	`1207`	`// TODO: Test this case.`
`@@ -1217,7 +1217,7 @@ int __syscall_fchownat(`
`1217`	`1217`	`return 0;`
`1218`	`1218`	`}`
`1219`	`1219`
`1220`		`-int __syscall_fchown32(int fd, int owner, int group) {`
	`1220`	`+int __syscall_fchown32(int fd, uid_t owner, gid_t group) {`
`1221`	`1221`	`return __syscall_fchownat(fd, (intptr_t) "", owner, group, AT_EMPTY_PATH);`
`1222`	`1222`	`}`
`1223`	`1223`