wasip3: Implement functions related to removing files/dirs

Gets a few more tests passing

Author: alexcrichton

cmake/bindings.cmake

@@ -113,9 +113,12 @@ add_custom_target(
       "--async=-wasi:filesystem/types@${wasip3-version}#[method]descriptor.metadata-hash"
       "--async=-wasi:filesystem/types@${wasip3-version}#[method]descriptor.metadata-hash-at"
       "--async=-wasi:filesystem/types@${wasip3-version}#[method]descriptor.stat"
+      "--async=-wasi:filesystem/types@${wasip3-version}#[method]descriptor.stat-at"
       "--async=-wasi:filesystem/types@${wasip3-version}#[method]descriptor.get-flags"
       "--async=-wasi:filesystem/types@${wasip3-version}#[method]descriptor.open-at"
       "--async=-wasi:filesystem/types@${wasip3-version}#[method]descriptor.read-directory"
+      "--async=-wasi:filesystem/types@${wasip3-version}#[method]descriptor.remove-directory-at"
+      "--async=-wasi:filesystem/types@${wasip3-version}#[method]descriptor.unlink-file-at"
       "--async=-wasi:clocks/monotonic-clock@${wasip3-version}#wait-until"
       "--async=-wasi:clocks/monotonic-clock@${wasip3-version}#wait-for"
       ${CMAKE_SOURCE_DIR}/wasi/p3/wit

libc-bottom-half/cloudlibc/src/libc/unistd/faccessat.c

@@ -55,15 +55,15 @@ int __wasilibc_nocwd_faccessat(int fd, const char *path, int amode, int flag) {
       return -1;
     }
   }
-#elif defined(__wasip2__)
+#elif defined(__wasip2__) || defined(__wasip3__)
   // Translate the file descriptor to an internal handle
   // Translate the file descriptor to an internal handle
   filesystem_borrow_descriptor_t file_handle;
   if (fd_to_file_handle(fd, &file_handle) < 0)
     return -1;
 
   // Convert the string into a WASI string
-  wasip2_string_t wasi_path;
+  wasi_string_t wasi_path;
   if (wasi_string_from_c(path, &wasi_path) < 0)
     return -1;
 
@@ -109,10 +109,6 @@ int __wasilibc_nocwd_faccessat(int fd, const char *path, int amode, int flag) {
       return -1;
     }
   }
-#elif defined(__wasip3__)
-  // TODO(wasip3)
-  errno = ENOTSUP;
-  return -1;
 #else
 # error "Unsupported WASI version"
 #endif

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

@@ -15,14 +15,14 @@ int __wasilibc_nocwd___wasilibc_rmdirat(int fd, const char *path) {
     errno = error;
     return -1;
   }
-#elif defined(__wasip2__)
+#elif defined(__wasip2__) || defined(__wasip3__)
   // Translate the file descriptor to an internal handle
   filesystem_borrow_descriptor_t file_handle;
   if (fd_to_file_handle(fd, &file_handle) < 0)
     return -1;
 
   // Create a WASI string for the path
-  wasip2_string_t wasi_path;
+  wasi_string_t wasi_path;
   if (wasi_string_from_c(path, &wasi_path) < 0)
     return -1;
   filesystem_error_code_t error_code;
@@ -34,10 +34,6 @@ int __wasilibc_nocwd___wasilibc_rmdirat(int fd, const char *path) {
     translate_error(error_code);
     return -1;
   }
-#elif defined(__wasip3__)
-  // TODO(wasip3)
-  errno = ENOTSUP;
-  return -1;
 #else
 #error "Unsupported WASI version"
 #endif

libc-bottom-half/sources/__wasilibc_rmdirat.c

@@ -16,7 +16,7 @@ int __wasilibc_nocwd___wasilibc_unlinkat(int fd, const char *path) {
     return -1;
   }
   return 0;
-#elif defined(__wasip2__)
+#elif defined(__wasip2__) || defined(__wasip3__)
   // Translate the file descriptor to an internal handle
   descriptor_table_entry_t *entry = descriptor_table_get_ref(fd);
   if (!entry)
@@ -33,7 +33,7 @@ int __wasilibc_nocwd___wasilibc_unlinkat(int fd, const char *path) {
     return -1;
 
   // Create a Wasm string from the path
-  wasip2_string_t wasi_path;
+  wasi_string_t wasi_path;
   if (wasi_string_from_c(path, &wasi_path) < 0)
     return -1;
 
@@ -47,10 +47,6 @@ int __wasilibc_nocwd___wasilibc_unlinkat(int fd, const char *path) {
   }
 
   return 0;
-#elif defined(__wasip3__)
-  // TODO(wasip3)
-  errno = ENOTSUP;
-  return -1;
 #else
 #error "Unknown WASI version"
 #endif

libc-bottom-half/sources/__wasilibc_unlinkat.c

@@ -243,7 +243,7 @@ endfunction()
 # TODO: this test fails with `-Sthreads` in Wasmtime since that uses a different
 # implementation of WASI which causes this test to fail.
 if (NOT TARGET_TRIPLE MATCHES "-threads")
-  add_wasilibc_test(access.c FS FAILP3)
+  add_wasilibc_test(access.c FS)
 endif()
 add_wasilibc_test(append.c FS FAILP3)
 add_wasilibc_test(argv_two_args.c ARGV foo bar)
@@ -252,23 +252,23 @@ add_wasilibc_test(chdir.c FS FAILP3)
 add_wasilibc_test(close.c FS)
 add_wasilibc_test(external_env.c ENV VAR1=foo VAR2=bar)
 add_wasilibc_test(fadvise.c FS FAILP3)
-add_wasilibc_test(fallocate.c FS FAILP3)
-add_wasilibc_test(fcntl.c FS FAILP3)
+add_wasilibc_test(fallocate.c FS)
+add_wasilibc_test(fcntl.c FS)
 add_wasilibc_test(fdatasync.c FS FAILP3)
-add_wasilibc_test(fdopen.c FS FAILP3)
+add_wasilibc_test(fdopen.c FS)
 add_wasilibc_test(feof.c FS)
-add_wasilibc_test(file_permissions.c FS FAILP3)
+add_wasilibc_test(file_permissions.c FS)
 add_wasilibc_test(file_nonblocking.c FS)
-add_wasilibc_test(fseek.c FS FAILP3)
+add_wasilibc_test(fseek.c FS)
 add_wasilibc_test(fstat.c FS FAILP3)
 add_wasilibc_test(fsync.c FS FAILP3)
 add_wasilibc_test(ftruncate.c FS FAILP3)
 add_wasilibc_test(fts.c FS FAILP3)
 add_wasilibc_test(fwscanf.c FS)
 add_wasilibc_test(getentropy.c)
 add_wasilibc_test(hello.c PASS_REGULAR_EXPRESSION "Hello, World!")
-add_wasilibc_test(ioctl.c FS FAILP3)
-add_wasilibc_test(isatty.c FS FAILP3)
+add_wasilibc_test(ioctl.c FS)
+add_wasilibc_test(isatty.c FS)
 add_wasilibc_test(link.c FS FAILP3)
 add_wasilibc_test(lseek.c FS)
 add_wasilibc_test(memchr.c LDFLAGS -Wl,--stack-first -Wl,--initial-memory=327680)