p3: implement fcntl (WebAssembly#752)

Rebasing of WebAssembly#745 after
recent merges

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
Co-authored-by: Roman Volosatovs <rvolosatovs@riseup.net>

Author: alexcrichton

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

@@ -13,7 +13,7 @@
 #endif
 
 int fcntl(int fildes, int cmd, ...) {
-#ifdef __wasip2__
+#if defined(__wasip2__) || defined(__wasip3__)
   descriptor_table_entry_t *entry = descriptor_table_get_ref(fildes);
   if (entry == NULL)
     return -1;
@@ -51,16 +51,12 @@ int fcntl(int fildes, int cmd, ...) {
         oflags |= O_SEARCH;
       }
       return oflags;
-#elif defined(__wasip2__)
+#elif defined(__wasip2__) || defined(__wasip3__) 
       if (!entry->vtable->fcntl_getfl) {
         errno = EINVAL;
         return -1;
       }
       return entry->vtable->fcntl_getfl(entry->data);
-#elif defined(__wasip3__)
-      // TODO(wasip3)
-      errno = ENOTSUP;
-      return -1;
 #else
 # error "Unknown WASI version"
 #endif
@@ -80,16 +76,12 @@ int fcntl(int fildes, int cmd, ...) {
         errno = error;
         return -1;
       }
-#elif defined(__wasip2__)
+#elif defined(__wasip2__) || defined(__wasip3__)
       if (!entry->vtable->fcntl_setfl) {
         errno = EINVAL;
         return -1;
       }
       return entry->vtable->fcntl_setfl(entry->data, flags);
-#elif defined(__wasip3__)
-      // TODO(wasip3)
-      errno = ENOTSUP;
-      return -1;
 #else
 # error "Unknown WASI version"
 #endif

libc-bottom-half/cloudlibc/src/libc/poll/poll.c

@@ -288,7 +288,6 @@ static int poll_impl(struct pollfd *fds, size_t nfds, int timeout) {
 #elif defined(__wasip3__)
 
 static int poll_impl(struct pollfd *fds, size_t nfds, int timeout) {
-  // TODO(wasip3)
   errno = ENOTSUP;
   return -1;
 }

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

@@ -89,7 +89,7 @@ int ioctl(int fildes, int request, ...) {
         return -1;
       }
       return 0;
-#elif defined(__wasip2__)
+#elif defined(__wasip2__) || defined(__wasip3__) 
       descriptor_table_entry_t *entry = descriptor_table_get_ref(fildes);
       va_list ap;
       va_start(ap, request);
@@ -101,10 +101,6 @@ int ioctl(int fildes, int request, ...) {
         return -1;
       }
       return entry->vtable->set_blocking(entry->data, blocking);
-#elif defined(__wasip3__)
-      // TODO(wasip3)
-      errno = ENOTSUP;
-      return -1;
 #else
 # error "Unknown WASI version"
 #endif

libc-bottom-half/sources/udp.c

@@ -836,6 +836,7 @@ static int udp_poll_register(void *data, poll_state_t *state, short events) {
   }
   return 0;
 }
+#endif
 
 static int udp_fcntl_getfl(void *data) {
   udp_socket_t *socket = (udp_socket_t *)data;
@@ -855,7 +856,6 @@ static int udp_fcntl_setfl(void *data, int flags) {
   }
   return 0;
 }
-#endif
 
 static descriptor_vtable_t udp_vtable = {
     .free = udp_free,
@@ -874,8 +874,8 @@ static descriptor_vtable_t udp_vtable = {
     .setsockopt = udp_setsockopt,
 
     .poll_register = udp_poll_register,
+#endif
 
     .fcntl_getfl = udp_fcntl_getfl,
     .fcntl_setfl = udp_fcntl_setfl,
-#endif
 };

test/CMakeLists.txt

@@ -318,7 +318,7 @@ if (NOT (WASI STREQUAL "p1"))
   add_wasilibc_test(sockets-nonblocking-udp.c NETWORK FAILP3)
   add_wasilibc_test(sockets-nonblocking-multiple.c NETWORK FAILP3)
   add_wasilibc_test(sockets-nonblocking-udp-multiple.c NETWORK FAILP3)
-  add_wasilibc_test(sockets-fcntl.c NETWORK FAILP3)
+  add_wasilibc_test(sockets-fcntl.c NETWORK)
 
   # TODO: flaky tests
   # add_wasilibc_test(sockets-nonblocking.c NETWORK)