Port __wasilibc_fd_renumber

Author: catamorphism

libc-bottom-half/cloudlibc/src/libc/dirent/fdopendir.c

@@ -56,7 +56,7 @@ DIR *fdopendir(int fd) {
   stream_info.directory_file_handle = file_handle;
   new_entry.directory_stream_info = stream_info;
   int new_fd = -1;
-  descriptor_table_insert(new_entry, &dirp->fd);
+  descriptor_table_update(dirp->fd, new_entry);
 
   dirp->cookie = __WASI_DIRCOOKIE_START;
   dirp->buffer_processed = 0;

libc-bottom-half/sources/__wasilibc_fd_renumber.c

@@ -1,4 +1,8 @@
+#ifdef __wasilibc_use_wasip2
+#include <wasi/descriptor_table.h>
+#else
 #include <wasi/api.h>
+#endif
 #include <wasi/libc.h>
 #include <errno.h>
 #include <unistd.h>
@@ -7,16 +11,27 @@ int __wasilibc_fd_renumber(int fd, int newfd) {
     // Scan the preopen fds before making any changes.
     __wasilibc_populate_preopens();
 
+#ifdef __wasilibc_use_wasip2
+    descriptor_table_entry_t* entry;
+    if (!descriptor_table_get_ref(fd, &entry)) {
+        errno = EBADF;
+        return -1;
+    }
+    if (!descriptor_table_update(newfd, *entry)) {
+        errno = EBADF;
+        return -1;
+    }
+#else
     __wasi_errno_t error = __wasi_fd_renumber(fd, newfd);
     if (error != 0) {
         errno = error;
         return -1;
     }
+#endif
     return 0;
 }
 
 #ifdef __wasilibc_use_wasip2
-#include <wasi/descriptor_table.h>
 
 void drop_tcp_socket(tcp_socket_t socket) {
     switch (socket.state.tag) {

libc-bottom-half/sources/descriptor_table.c

@@ -207,13 +207,8 @@ static bool remove(int fd, descriptor_table_entry_t *entry,
 
 bool descriptor_table_insert(descriptor_table_entry_t entry, int *fd)
 {
-        *fd = ++next_fd;
-        if (insert(entry, *fd, &global_table, false)) {
-                return true;
-        } else {
-                *fd = -1;
-                return false;
-        }
+       *fd = ++next_fd;
+       return insert(entry, *fd, &global_table, false);
 }
 
 bool descriptor_table_get_ref(int fd, descriptor_table_entry_t **entry)
@@ -222,18 +217,10 @@ bool descriptor_table_get_ref(int fd, descriptor_table_entry_t **entry)
 }
 
 bool descriptor_table_update(int fd, descriptor_table_entry_t entry) {
-    if (!global_table.entries)
-        return false;
-
-    size_t hash = keyhash(fd);
-    descriptor_table_item_t *e = lookup(fd, hash, &global_table);
-    if (e->occupied) {
-        insert(entry, fd, &global_table, true);
-        return true;
-    }
-    else {
-        return false;
-    }
+        if (!global_table.entries)
+            return false;
+
+        return insert(entry, fd, &global_table, true);
 }
 
 bool descriptor_table_remove(int fd, descriptor_table_entry_t *entry)