From 4901394af88e5b95a01980285afa5aaf1158a224 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 4 May 2023 20:42:42 +0000 Subject: [PATCH 1/2] deps: update uvwasi to 0.0.17 --- deps/uvwasi/include/uvwasi.h | 2 +- deps/uvwasi/src/uvwasi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/uvwasi/include/uvwasi.h b/deps/uvwasi/include/uvwasi.h index b5da3108629792..aee6b4de191962 100644 --- a/deps/uvwasi/include/uvwasi.h +++ b/deps/uvwasi/include/uvwasi.h @@ -10,7 +10,7 @@ extern "C" { #define UVWASI_VERSION_MAJOR 0 #define UVWASI_VERSION_MINOR 0 -#define UVWASI_VERSION_PATCH 16 +#define UVWASI_VERSION_PATCH 17 #define UVWASI_VERSION_HEX ((UVWASI_VERSION_MAJOR << 16) | \ (UVWASI_VERSION_MINOR << 8) | \ (UVWASI_VERSION_PATCH)) diff --git a/deps/uvwasi/src/uvwasi.c b/deps/uvwasi/src/uvwasi.c index 38a6817cfdac30..9e7fc7681664b8 100644 --- a/deps/uvwasi/src/uvwasi.c +++ b/deps/uvwasi/src/uvwasi.c @@ -1122,7 +1122,7 @@ uvwasi_errno_t uvwasi_fd_prestat_get(uvwasi_t* uvwasi, } buf->pr_type = UVWASI_PREOPENTYPE_DIR; - buf->u.dir.pr_name_len = strlen(wrap->path) + 1; + buf->u.dir.pr_name_len = strlen(wrap->path); err = UVWASI_ESUCCESS; exit: uv_mutex_unlock(&wrap->mutex); @@ -1156,7 +1156,7 @@ uvwasi_errno_t uvwasi_fd_prestat_dir_name(uvwasi_t* uvwasi, goto exit; } - size = strlen(wrap->path) + 1; + size = strlen(wrap->path); if (size > (size_t) path_len) { err = UVWASI_ENOBUFS; goto exit; From 1aeb0f5095505e17fc2e6563e4986430007445fa Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Fri, 19 May 2023 02:23:23 +0000 Subject: [PATCH 2/2] deps: update uvwasi to 0.0.18 --- deps/uvwasi/include/uvwasi.h | 2 +- deps/uvwasi/src/uv_mapping.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/deps/uvwasi/include/uvwasi.h b/deps/uvwasi/include/uvwasi.h index aee6b4de191962..d475d3e67512bf 100644 --- a/deps/uvwasi/include/uvwasi.h +++ b/deps/uvwasi/include/uvwasi.h @@ -10,7 +10,7 @@ extern "C" { #define UVWASI_VERSION_MAJOR 0 #define UVWASI_VERSION_MINOR 0 -#define UVWASI_VERSION_PATCH 17 +#define UVWASI_VERSION_PATCH 18 #define UVWASI_VERSION_HEX ((UVWASI_VERSION_MAJOR << 16) | \ (UVWASI_VERSION_MINOR << 8) | \ (UVWASI_VERSION_PATCH)) diff --git a/deps/uvwasi/src/uv_mapping.c b/deps/uvwasi/src/uv_mapping.c index 75405c163b6130..41e684d5dcf2f4 100644 --- a/deps/uvwasi/src/uv_mapping.c +++ b/deps/uvwasi/src/uv_mapping.c @@ -24,6 +24,10 @@ # define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) #endif +#if !defined(S_ISFIFO) && defined(S_IFMT) && defined(S_IFIFO) +# define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) +#endif + uvwasi_errno_t uvwasi__translate_uv_error(int err) { switch (err) {