Rename __wasilibc_rmfileat to __wasilibc_unlinkat.

The POSIX terminology is that directories are "removed" while files
are "unlinked".

diff --git a/expected/wasm32-wasi/defined-symbols.txt b/expected/wasm32-wasi/defined-symbols.txt
index 08a337cbb36a5d4bc9ccc4e705bca2aa3c4e3841..e3c05d28d8bdd89a940d676d6afb38e2f135b1d0 100644 (file)
--- a/expected/wasm32-wasi/defined-symbols.txt
+++ b/expected/wasm32-wasi/defined-symbols.txt
@@ -241,8 +241,8 @@ __wasilibc_find_relpath
 __wasilibc_init_preopen
 __wasilibc_register_preopened_fd
 __wasilibc_rmdirat
-__wasilibc_rmfileat
 __wasilibc_tell
+__wasilibc_unlinkat
 __wcscoll_l
 __wcsftime_l
 __wcsxfrm_l

diff --git a/libc-bottom-half/cloudlibc/src/libc/unistd/__wasilibc_rmfileat.c b/libc-bottom-half/cloudlibc/src/libc/unistd/__wasilibc_rmfileat.c
deleted file mode 100644 (file)
index aece605..0000000
--- a/libc-bottom-half/cloudlibc/src/libc/unistd/__wasilibc_rmfileat.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <common/errno.h>
-#include <wasi/core.h>
-#include <wasi/libc.h>
-#include <errno.h>
-#include <string.h>
-
-int __wasilibc_rmfileat(int fd, const char *path) {
-    size_t path_len = strlen(path);
-    __wasi_errno_t error = __wasi_path_unlink_file(fd, path, path_len);
-    if (error != 0) {
-        errno = error;
-        return -1;
-    }
-    return 0;
-}

diff --git a/libc-bottom-half/cloudlibc/src/libc/unistd/__wasilibc_unlinkat.c b/libc-bottom-half/cloudlibc/src/libc/unistd/__wasilibc_unlinkat.c
new file mode 100644 (file)
index 0000000..e5c84a2
--- /dev/null
+++ b/libc-bottom-half/cloudlibc/src/libc/unistd/__wasilibc_unlinkat.c
@@ -0,0 +1,15 @@
+#include <common/errno.h>
+#include <wasi/core.h>
+#include <wasi/libc.h>
+#include <errno.h>
+#include <string.h>
+
+int __wasilibc_unlinkat(int fd, const char *path) {
+    size_t path_len = strlen(path);
+    __wasi_errno_t error = __wasi_path_unlink_file(fd, path, path_len);
+    if (error != 0) {
+        errno = error;
+        return -1;
+    }
+    return 0;
+}

diff --git a/libc-bottom-half/cloudlibc/src/libc/unistd/unlinkat.c b/libc-bottom-half/cloudlibc/src/libc/unistd/unlinkat.c
index 6756f89d4df92deadce8eb14f28fff666442e060..d070bb0d48e19dd738475046383ce6560fbf6151 100644 (file)
--- a/libc-bottom-half/cloudlibc/src/libc/unistd/unlinkat.c
+++ b/libc-bottom-half/cloudlibc/src/libc/unistd/unlinkat.c
@@ -30,6 +30,6 @@ int unlinkat(int fd, const char *path, int flag) {
   if ((flag & AT_REMOVEDIR) != 0) {
     return __wasilibc_rmdirat(fd, path);
   }
-  return __wasilibc_rmfileat(fd, path);
+  return __wasilibc_unlinkat(fd, path);
 #endif
 }

diff --git a/libc-bottom-half/headers/public/wasi/libc.h b/libc-bottom-half/headers/public/wasi/libc.h
index f3bebf033693faa110ae26b0b09d81bf7875a392..dcccf37f1486610fb715fa0246a69a1c02225df7 100644 (file)
--- a/libc-bottom-half/headers/public/wasi/libc.h
+++ b/libc-bottom-half/headers/public/wasi/libc.h
@@ -10,7 +10,7 @@ extern "C" {
 void __wasilibc_init_preopen(void);
 int __wasilibc_register_preopened_fd(int fd, const char *path);
 int __wasilibc_fd_renumber(int fd, int newfd);
-int __wasilibc_rmfileat(int fd, const char *path);
+int __wasilibc_unlinkat(int fd, const char *path);
 int __wasilibc_rmdirat(int fd, const char *path);
 off_t __wasilibc_tell(int fd);
 

diff --git a/libc-bottom-half/libpreopen/lib/po_libc_wrappers.c b/libc-bottom-half/libpreopen/lib/po_libc_wrappers.c
index 5aead7931a4abcc8a72db166c89f051ad54154c7..6fe2ebc1c53dcbde5286bbcbbed34b1b08a87f63 100644 (file)
--- a/libc-bottom-half/libpreopen/lib/po_libc_wrappers.c
+++ b/libc-bottom-half/libpreopen/lib/po_libc_wrappers.c
@@ -409,7 +409,7 @@ unlink(const char *pathname)
            return -1;
        }
 
-       return __wasilibc_rmfileat(rel_pathname.dirfd, rel_pathname.relative_path);
+       return __wasilibc_unlinkat(rel_pathname.dirfd, rel_pathname.relative_path);
 }
 
 int
@@ -451,7 +451,7 @@ remove(const char *pathname)
            return -1;
        }
 
-       int r = __wasilibc_rmfileat(rel_pathname.dirfd, rel_pathname.relative_path);
+       int r = __wasilibc_unlinkat(rel_pathname.dirfd, rel_pathname.relative_path);
        if (r != 0 && (errno == EISDIR || errno == ENOTCAPABLE))
                r = __wasilibc_rmdirat(rel_pathname.dirfd, rel_pathname.relative_path);
        return r;