Rename path_unlink_directory to path_remove_directory.

Author: sunfishcode

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

@@ -5,7 +5,7 @@
 
 int __wasilibc_rmdirat(int fd, const char *path) {
     size_t path_len = strlen(path);
-    __wasi_errno_t error = __wasi_path_unlink_directory(fd, path, path_len);
+    __wasi_errno_t error = __wasi_path_remove_directory(fd, path, path_len);
     if (error != 0) {
         errno = errno_fixup_directory(fd, error);
         return -1;

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

@@ -211,7 +211,7 @@ typedef uint64_t __wasi_rights_t;
 #define __WASI_RIGHT_FD_FILESTAT_SET_SIZE   (UINT64_C(0x0000000000400000))
 #define __WASI_RIGHT_FD_FILESTAT_SET_TIMES  (UINT64_C(0x0000000000800000))
 #define __WASI_RIGHT_PATH_SYMLINK          (UINT64_C(0x0000000001000000))
-#define __WASI_RIGHT_PATH_UNLINK_DIRECTORY (UINT64_C(0x0000000002000000))
+#define __WASI_RIGHT_PATH_REMOVE_DIRECTORY (UINT64_C(0x0000000002000000))
 #define __WASI_RIGHT_PATH_UNLINK_FILE      (UINT64_C(0x0000000004000000))
 #define __WASI_RIGHT_POLL_FD_READWRITE     (UINT64_C(0x0000000008000000))
 #define __WASI_RIGHT_SOCK_SHUTDOWN         (UINT64_C(0x0000000010000000))
@@ -628,11 +628,11 @@ __wasi_errno_t __wasi_path_unlink_file(
     size_t path_len
 ) __WASI_SYSCALL_NAME(path_unlink_file) __attribute__((__warn_unused_result__));
 
-__wasi_errno_t __wasi_path_unlink_directory(
+__wasi_errno_t __wasi_path_remove_directory(
     __wasi_fd_t fd,
     const char *path,
     size_t path_len
-) __WASI_SYSCALL_NAME(path_unlink_directory) __attribute__((__warn_unused_result__));
+) __WASI_SYSCALL_NAME(path_remove_directory) __attribute__((__warn_unused_result__));
 
 __wasi_errno_t __wasi_poll_oneoff(
     const __wasi_subscription_t *in,

libc-bottom-half/libpreopen/lib/po_libc_wrappers.c

@@ -358,7 +358,7 @@ unlink(const char *pathname)
 int
 rmdir(const char *pathname)
 {
-	struct po_relpath rel_pathname = find_relative(pathname, __WASI_RIGHT_PATH_UNLINK_DIRECTORY, 0);
+	struct po_relpath rel_pathname = find_relative(pathname, __WASI_RIGHT_PATH_REMOVE_DIRECTORY, 0);
 
 	return __wasilibc_rmdirat(rel_pathname.dirfd, rel_pathname.relative_path);
 }
@@ -368,15 +368,15 @@ remove(const char *pathname)
 {
 	struct po_relpath rel_pathname = find_relative(pathname,
 	                                               __WASI_RIGHT_PATH_UNLINK_FILE |
-	                                               __WASI_RIGHT_PATH_UNLINK_DIRECTORY,
+	                                               __WASI_RIGHT_PATH_REMOVE_DIRECTORY,
                                                        0);
 
 	// If searching for both file and directory rights failed, try searching
 	// for either individually.
 	if (rel_pathname.dirfd == -1) {
 		rel_pathname = find_relative(pathname, __WASI_RIGHT_PATH_UNLINK_FILE, 0);
 		if (rel_pathname.dirfd == -1) {
-			rel_pathname = find_relative(pathname, __WASI_RIGHT_PATH_UNLINK_DIRECTORY, 0);
+			rel_pathname = find_relative(pathname, __WASI_RIGHT_PATH_REMOVE_DIRECTORY, 0);
 		}
 	}