Update for WASI API changes.

file_open's fds argument has been split into scalars, and the
RIGHT_FILE_FSTAT_* rights have been reinstated.

Author: sunfishcode

expected/wasm32-wasi/predefined-macros.txt

@@ -3538,6 +3538,9 @@
 #define __WASI_RIGHT_FILE_ALLOCATE (UINT64_C(0x0000000000000100))
 #define __WASI_RIGHT_FILE_CREATE_DIRECTORY (UINT64_C(0x0000000000000200))
 #define __WASI_RIGHT_FILE_CREATE_FILE (UINT64_C(0x0000000000000400))
+#define __WASI_RIGHT_FILE_FSTAT_GET (UINT64_C(0x0000000000200000))
+#define __WASI_RIGHT_FILE_FSTAT_SET_SIZE (UINT64_C(0x0000000000400000))
+#define __WASI_RIGHT_FILE_FSTAT_SET_TIMES (UINT64_C(0x0000000000800000))
 #define __WASI_RIGHT_FILE_LINK_SOURCE (UINT64_C(0x0000000000000800))
 #define __WASI_RIGHT_FILE_LINK_TARGET (UINT64_C(0x0000000000001000))
 #define __WASI_RIGHT_FILE_OPEN (UINT64_C(0x0000000000002000))
@@ -3548,10 +3551,10 @@
 #define __WASI_RIGHT_FILE_STAT_GET (UINT64_C(0x0000000000040000))
 #define __WASI_RIGHT_FILE_STAT_SET_SIZE (UINT64_C(0x0000000000080000))
 #define __WASI_RIGHT_FILE_STAT_SET_TIMES (UINT64_C(0x0000000000100000))
-#define __WASI_RIGHT_FILE_SYMLINK (UINT64_C(0x0000000000200000))
-#define __WASI_RIGHT_FILE_UNLINK (UINT64_C(0x0000000000400000))
-#define __WASI_RIGHT_POLL_FD_READWRITE (UINT64_C(0x0000000000800000))
-#define __WASI_RIGHT_SOCK_SHUTDOWN (UINT64_C(0x0000000001000000))
+#define __WASI_RIGHT_FILE_SYMLINK (UINT64_C(0x0000000001000000))
+#define __WASI_RIGHT_FILE_UNLINK (UINT64_C(0x0000000002000000))
+#define __WASI_RIGHT_POLL_FD_READWRITE (UINT64_C(0x0000000004000000))
+#define __WASI_RIGHT_SOCK_SHUTDOWN (UINT64_C(0x0000000008000000))
 #define __WASI_SHUT_RD (UINT8_C(0x01))
 #define __WASI_SHUT_WR (UINT8_C(0x02))
 #define __WASI_SIGABRT (UINT8_C(6))

libc-bottom-half/cloudlibc/src/libc/fcntl/openat.c

@@ -32,7 +32,7 @@ int openat(int fd, const char *path, int oflag, ...) {
 #ifdef __wasilibc_unmodified_upstream // fstat
         __WASI_RIGHT_FILE_READDIR | __WASI_RIGHT_FILE_STAT_FPUT_SIZE |
 #else
-        __WASI_RIGHT_FILE_READDIR | __WASI_RIGHT_FILE_STAT_SET_SIZE |
+        __WASI_RIGHT_FILE_READDIR | __WASI_RIGHT_FILE_FSTAT_SET_SIZE |
 #endif
 #ifdef __wasilibc_unmodified_upstream // RIGHT_MEM_MAP_EXEC
         __WASI_RIGHT_MEM_MAP_EXEC);
@@ -62,7 +62,7 @@ int openat(int fd, const char *path, int oflag, ...) {
 #ifdef __wasilibc_unmodified_upstream // fstat
                __WASI_RIGHT_FILE_STAT_FPUT_SIZE;
 #else
-               __WASI_RIGHT_FILE_STAT_SET_SIZE;
+               __WASI_RIGHT_FILE_FSTAT_SET_SIZE;
 #endif
       }
       break;
@@ -110,18 +110,25 @@ int openat(int fd, const char *path, int oflag, ...) {
 #endif
 
   // Open file with appropriate rights.
+#ifdef __wasilibc_unmodified_upstream // split out __wasi_lookup_t and __wasi_fdstat_t
   __wasi_fdstat_t fsb_new = {
       .fs_flags = oflag & 0xfff,
       .fs_rights_base = max & fsb_cur.fs_rights_inheriting,
       .fs_rights_inheriting = fsb_cur.fs_rights_inheriting,
   };
   __wasi_fd_t newfd;
-#ifdef __wasilibc_unmodified_upstream // split out __wasi_lookup_t
   error = __wasi_file_open(lookup, path, strlen(path),
+                                 (oflag >> 12) & 0xfff, &fsb_new, &newfd);
 #else
+  __wasi_fdflags_t fs_flags = oflag & 0xfff;
+  __wasi_rights_t fs_rights_base = max & fsb_cur.fs_rights_inheriting;
+  __wasi_rights_t fs_rights_inheriting = fsb_cur.fs_rights_inheriting;
+  __wasi_fd_t newfd;
   error = __wasi_file_open(fd, lookup_flags, path, strlen(path),
+                                 (oflag >> 12) & 0xfff,
+                                 fs_rights_base, fs_rights_inheriting, fs_flags,
+                                 &newfd);
 #endif
-                                 (oflag >> 12) & 0xfff, &fsb_new, &newfd);
   if (error != 0) {
 #ifdef __wasilibc_unmodified_upstream // split out __wasi_lookup_t
     errno = errno_fixup_directory(lookup.fd, error);

libc-bottom-half/headers/public/wasi.h

@@ -207,10 +207,13 @@ typedef uint64_t __wasi_rights_t;
 #define __WASI_RIGHT_FILE_STAT_GET         (UINT64_C(0x0000000000040000))
 #define __WASI_RIGHT_FILE_STAT_SET_SIZE    (UINT64_C(0x0000000000080000))
 #define __WASI_RIGHT_FILE_STAT_SET_TIMES   (UINT64_C(0x0000000000100000))
-#define __WASI_RIGHT_FILE_SYMLINK          (UINT64_C(0x0000000000200000))
-#define __WASI_RIGHT_FILE_UNLINK           (UINT64_C(0x0000000000400000))
-#define __WASI_RIGHT_POLL_FD_READWRITE     (UINT64_C(0x0000000000800000))
-#define __WASI_RIGHT_SOCK_SHUTDOWN         (UINT64_C(0x0000000001000000))
+#define __WASI_RIGHT_FILE_FSTAT_GET        (UINT64_C(0x0000000000200000))
+#define __WASI_RIGHT_FILE_FSTAT_SET_SIZE   (UINT64_C(0x0000000000400000))
+#define __WASI_RIGHT_FILE_FSTAT_SET_TIMES  (UINT64_C(0x0000000000800000))
+#define __WASI_RIGHT_FILE_SYMLINK          (UINT64_C(0x0000000001000000))
+#define __WASI_RIGHT_FILE_UNLINK           (UINT64_C(0x0000000002000000))
+#define __WASI_RIGHT_POLL_FD_READWRITE     (UINT64_C(0x0000000004000000))
+#define __WASI_RIGHT_SOCK_SHUTDOWN         (UINT64_C(0x0000000008000000))
 
 typedef uint16_t __wasi_roflags_t;
 #define __WASI_SOCK_RECV_DATA_TRUNCATED (UINT16_C(0x0001))
@@ -546,7 +549,9 @@ __wasi_errno_t __wasi_file_open(
     const char *path,
     size_t path_len,
     __wasi_oflags_t oflags,
-    const __wasi_fdstat_t *fds,
+    __wasi_rights_t fs_rights_base,
+    __wasi_rights_t fs_rights_inheriting,
+    __wasi_fdflags_t fs_flags,
     __wasi_fd_t *fd
 ) __WASI_SYSCALL_NAME(file_open) __attribute__((__warn_unused_result__));