Remove remaining uses of wasip1 functions with wasip2 defined

Author: catamorphism

libc-bottom-half/cloudlibc/src/libc/sys/ioctl/ioctl.c

@@ -68,6 +68,11 @@ int ioctl(int fildes, int request, ...) {
 
   switch (request) {
     case FIONREAD: {
+#ifdef __wasilibc_use_wasip2
+      // wasip2 doesn't support this operation
+      errno = ENOTSUP;
+      return -1;
+#else
       // Poll the file descriptor to determine how many bytes can be read.
       __wasi_subscription_t subscriptions[2] = {
           {
@@ -110,8 +115,14 @@ int ioctl(int fildes, int request, ...) {
       // No data available for reading.
       *result = 0;
       return 0;
+#endif
     }
     case FIONBIO: {
+#ifdef __wasilibc_use_wasip2
+      // wasip2 doesn't support setting the non-blocking flag
+      errno = ENOTSUP;
+      return -1;
+#else
       // Obtain the current file descriptor flags.
       __wasi_fdstat_t fds;
       __wasi_errno_t error = __wasi_fd_fdstat_get(fildes, &fds);
@@ -136,6 +147,7 @@ int ioctl(int fildes, int request, ...) {
         return -1;
       }
       return 0;
+#endif
     }
     default:
       // Invalid request.

libc-bottom-half/cloudlibc/src/libc/sys/uio/readv.c

@@ -30,11 +30,15 @@ ssize_t readv(int fildes, const struct iovec *iov, int iovcnt) {
     return -1;
   }
   size_t bytes_read;
+#ifdef __wasilibc_use_wasip2
+  return preadv(fildes, iov, iovcnt, 0);
+#else
   __wasi_errno_t error = __wasi_fd_read(
       fildes, (const __wasi_iovec_t *)iov, iovcnt, &bytes_read);
   if (error != 0) {
     errno = error;
     return -1;
   }
+#endif
   return bytes_read;
 }

libc-bottom-half/sources/__wasilibc_fd_renumber.c

@@ -114,13 +114,13 @@ int close(int fd) {
 
         return 0;
     }
-#endif // __wasilibc_use_wasip2
-
+#else
     __wasi_errno_t error = __wasi_fd_close(fd);
     if (error != 0) {
         errno = error;
         return -1;
     }
+#endif // __wasilibc_use_wasip2
 
     return 0;
 }