diff --git a/README.md b/README.md index 91409f5..b7543f1 100644 --- a/README.md +++ b/README.md @@ -1378,7 +1378,7 @@ Possible values: Argument list too long. -- **`UVWASI_EACCES`** +- **`UVWASI_EACCESS`** Permission denied. diff --git a/include/wasi_types.h b/include/wasi_types.h index e6306c5..3b30fd3 100644 --- a/include/wasi_types.h +++ b/include/wasi_types.h @@ -31,7 +31,7 @@ typedef uint64_t uvwasi_dircookie_t; typedef uint16_t uvwasi_errno_t; #define UVWASI_ESUCCESS 0 #define UVWASI_E2BIG 1 -#define UVWASI_EACCES 2 +#define UVWASI_EACCESS 2 #define UVWASI_EADDRINUSE 3 #define UVWASI_EADDRNOTAVAIL 4 #define UVWASI_EAFNOSUPPORT 5 diff --git a/src/uv_mapping.c b/src/uv_mapping.c index 39d7bc1..223b872 100644 --- a/src/uv_mapping.c +++ b/src/uv_mapping.c @@ -28,7 +28,7 @@ uvwasi_errno_t uvwasi__translate_uv_error(int err) { switch (err) { case UV_E2BIG: return UVWASI_E2BIG; - case UV_EACCES: return UVWASI_EACCES; + case UV_EACCES: return UVWASI_EACCESS; case UV_EADDRINUSE: return UVWASI_EADDRINUSE; case UV_EADDRNOTAVAIL: return UVWASI_EADDRNOTAVAIL; case UV_EAFNOSUPPORT: return UVWASI_EAFNOSUPPORT; diff --git a/src/uvwasi.c b/src/uvwasi.c index 4f9eaa1..fbffb5f 100644 --- a/src/uvwasi.c +++ b/src/uvwasi.c @@ -2418,7 +2418,7 @@ const char* uvwasi_embedder_err_code_to_string(uvwasi_errno_t code) { switch (code) { #define V(errcode) case errcode: return #errcode; V(UVWASI_E2BIG) - V(UVWASI_EACCES) + V(UVWASI_EACCESS) V(UVWASI_EADDRINUSE) V(UVWASI_EADDRNOTAVAIL) V(UVWASI_EAFNOSUPPORT) diff --git a/test/test-uv-mapping.c b/test/test-uv-mapping.c index 378d453..8982b9d 100644 --- a/test/test-uv-mapping.c +++ b/test/test-uv-mapping.c @@ -8,7 +8,6 @@ int main(void) { /* Verify error code translation. */ CHECK_ERR(E2BIG); - CHECK_ERR(EACCES); CHECK_ERR(EADDRINUSE); CHECK_ERR(EADDRNOTAVAIL); CHECK_ERR(EAFNOSUPPORT); @@ -63,6 +62,10 @@ int main(void) { CHECK_ERR(ETIMEDOUT); CHECK_ERR(ETXTBSY); CHECK_ERR(EXDEV); + + /* EACCES is no longer consistently named. */ + assert(uvwasi__translate_uv_error(UV_EACCES) == UVWASI_EACCESS); + assert(uvwasi__translate_uv_error(0) == UVWASI_ESUCCESS); assert(uvwasi__translate_uv_error(1) == 1); assert(uvwasi__translate_uv_error(-99999) == UVWASI_ENOSYS);