deps: update to uvwasi 0.0.10

Notable changes:

- The uvwasi_preopen_t now uses const char* for the mapped_path
  and real_path fields. Previously, these were not `const`.
- uvwasi_path_filestat_get() now properly handles the
  UVWASI_LOOKUP_SYMLINK_FOLLOW flag.
- uvwasi_options_init() has been added to reduce the boilerplate
  code associated with initializing uvwasi_options_t's.
- The DEBUG() macro has been renamed to UVWASI_DEBUG() to reduce
  naming conflicts with other projects.
- A compilation error on NetBSD 8.2 has been fixed.
- The uvwasi_fd_filestat_set_times() and
  uvwasi_path_filestat_set_times() functions now have proper
  implementations.

Fixes: https://github.com/nodejs/node/issues/34510

PR-URL: https://github.com/nodejs/node/pull/34623
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

4 files changed, 383 insertions, 254 deletions

diff --git a/deps/uvwasi/include/uvwasi.h b/deps/uvwasi/include/uvwasi.h
index 0090313c8a..9a0f8aa3c6 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 9
+#define UVWASI_VERSION_PATCH 10
 #define UVWASI_VERSION_HEX ((UVWASI_VERSION_MAJOR << 16) | \
                             (UVWASI_VERSION_MINOR <<  8) | \
                             (UVWASI_VERSION_PATCH))
@@ -50,8 +50,8 @@ typedef struct uvwasi_s {
 } uvwasi_t;
 
 typedef struct uvwasi_preopen_s {
-  char* mapped_path;
-  char* real_path;
+  const char* mapped_path;
+  const char* real_path;
 } uvwasi_preopen_t;
 
 typedef struct uvwasi_options_s {
@@ -70,6 +70,7 @@ typedef struct uvwasi_options_s {
 /* Embedder API. */
 uvwasi_errno_t uvwasi_init(uvwasi_t* uvwasi, uvwasi_options_t* options);
 void uvwasi_destroy(uvwasi_t* uvwasi);
+void uvwasi_options_init(uvwasi_options_t* options);
 /* Use int instead of uv_file to avoid needing uv.h */
 uvwasi_errno_t uvwasi_embedder_remap_fd(uvwasi_t* uvwasi,
                                         const uvwasi_fd_t fd,
diff --git a/deps/uvwasi/include/wasi_serdes.h b/deps/uvwasi/include/wasi_serdes.h
index f927b82bac..ed80e4a88e 100644
--- a/deps/uvwasi/include/wasi_serdes.h
+++ b/deps/uvwasi/include/wasi_serdes.h
@@ -5,21 +5,20 @@
 
 /* Basic uint{8,16,32,64}_t read/write functions. */
 
-#define BASIC_TYPE_(name, type)                                               \
+#define BASIC_TYPE(name, type)                                                \
   void uvwasi_serdes_write_##name(void* ptr, size_t offset, type value);      \
   type uvwasi_serdes_read_##name(const void* ptr, size_t offset);             \
 
-#define BASIC_TYPE(type) BASIC_TYPE_(type, type)
-#define BASIC_TYPE_UVWASI(type) BASIC_TYPE_(type, uvwasi_##type)
+#define BASIC_TYPE_UVWASI(type) BASIC_TYPE(type, uvwasi_##type)
 
 #define UVWASI_SERDES_SIZE_uint8_t sizeof(uint8_t)
-BASIC_TYPE(uint8_t)
+BASIC_TYPE(uint8_t, uint8_t)
 #define UVWASI_SERDES_SIZE_uint16_t sizeof(uint16_t)
-BASIC_TYPE(uint16_t)
+BASIC_TYPE(uint16_t, uint16_t)
 #define UVWASI_SERDES_SIZE_uint32_t sizeof(uint32_t)
-BASIC_TYPE(uint32_t)
+BASIC_TYPE(uint32_t, uint32_t)
 #define UVWASI_SERDES_SIZE_uint64_t sizeof(uint64_t)
-BASIC_TYPE(uint64_t)
+BASIC_TYPE(uint64_t, uint64_t)
 
 #define UVWASI_SERDES_SIZE_advice_t sizeof(uvwasi_advice_t)
 BASIC_TYPE_UVWASI(advice_t)
@@ -80,7 +79,6 @@ BASIC_TYPE_UVWASI(whence_t)
 
 #undef BASIC_TYPE_UVWASI
 #undef BASIC_TYPE
-#undef BASIC_TYPE_
 
 /* WASI structure read/write functions. */
 
diff --git a/deps/uvwasi/src/debug.h b/deps/uvwasi/src/debug.h
index 16bc2732ec..8ef5a99a23 100644
--- a/deps/uvwasi/src/debug.h
+++ b/deps/uvwasi/src/debug.h
@@ -2,12 +2,14 @@
 #define __UVWASI_DEBUG_H__
 
 #ifdef UVWASI_DEBUG_LOG
+#ifndef __STDC_FORMAT_MACROS
 # define __STDC_FORMAT_MACROS
+#endif
 # include <inttypes.h>
-# define DEBUG(fmt, ...)                                                      \
+# define UVWASI_DEBUG(fmt, ...)                                                      \
     do { fprintf(stderr, fmt, __VA_ARGS__); } while (0)
 #else
-# define DEBUG(fmt, ...)
+# define UVWASI_DEBUG(fmt, ...)
 #endif
 
 #endif /* __UVWASI_DEBUG_H__ */
diff --git a/deps/uvwasi/src/uvwasi.c b/deps/uvwasi/src/uvwasi.c
index fc8f0ee484..acc25c3dba 100644
--- a/deps/uvwasi/src/uvwasi.c
+++ b/deps/uvwasi/src/uvwasi.c
@@ -29,6 +29,78 @@
 # undef POSIX_FADV_NORMAL
 #endif
 
+#define VALIDATE_FSTFLAGS_OR_RETURN(flags)                                    \
+  do {                                                                        \
+    if ((flags) & ~(UVWASI_FILESTAT_SET_ATIM |                                \
+                    UVWASI_FILESTAT_SET_ATIM_NOW |                            \
+                    UVWASI_FILESTAT_SET_MTIM |                                \
+                    UVWASI_FILESTAT_SET_MTIM_NOW)) {                          \
+      return UVWASI_EINVAL;                                                   \
+    }                                                                         \
+  } while (0)
+
+static uvwasi_errno_t uvwasi__get_filestat_set_times(
+                                                    uvwasi_timestamp_t* st_atim,
+                                                    uvwasi_timestamp_t* st_mtim,
+                                                    uvwasi_fstflags_t fst_flags,
+                                                    uv_file* fd,
+                                                    char* path
+                                                  ) {
+  uvwasi_filestat_t stat;
+  uvwasi_timestamp_t now;
+  uvwasi_errno_t err;
+  uv_fs_t req;
+  int r;
+
+  /* Check if either value requires the current time. */
+  if ((fst_flags &
+      (UVWASI_FILESTAT_SET_ATIM_NOW | UVWASI_FILESTAT_SET_MTIM_NOW)) != 0) {
+    err = uvwasi__clock_gettime_realtime(&now);
+    if (err != UVWASI_ESUCCESS)
+      return err;
+  }
+
+  /* Check if either value is omitted. libuv doesn't have an 'omitted' option,
+     so get the current stats for the file. This approach isn't perfect, but it
+     will do until libuv can get better support here. */
+  if ((fst_flags &
+       (UVWASI_FILESTAT_SET_ATIM | UVWASI_FILESTAT_SET_ATIM_NOW)) == 0 ||
+      (fst_flags &
+       (UVWASI_FILESTAT_SET_MTIM | UVWASI_FILESTAT_SET_MTIM_NOW)) == 0) {
+
+    if (fd != NULL)
+      r = uv_fs_fstat(NULL, &req, *fd, NULL);
+    else
+      r = uv_fs_lstat(NULL, &req, path, NULL);
+
+    if (r != 0) {
+      uv_fs_req_cleanup(&req);
+      return uvwasi__translate_uv_error(r);
+    }
+
+    uvwasi__stat_to_filestat(&req.statbuf, &stat);
+    uv_fs_req_cleanup(&req);
+  }
+
+  /* Choose the provided time or 'now' and convert WASI timestamps from
+     nanoseconds to seconds due to libuv. */
+  if ((fst_flags & UVWASI_FILESTAT_SET_ATIM_NOW) != 0)
+    *st_atim = now / NANOS_PER_SEC;
+  else if ((fst_flags & UVWASI_FILESTAT_SET_ATIM) != 0)
+    *st_atim = *st_atim / NANOS_PER_SEC;
+  else
+    *st_atim = stat.st_atim / NANOS_PER_SEC;
+
+  if ((fst_flags & UVWASI_FILESTAT_SET_MTIM_NOW) != 0)
+    *st_mtim = now / NANOS_PER_SEC;
+  else if ((fst_flags & UVWASI_FILESTAT_SET_MTIM) != 0)
+    *st_mtim = *st_mtim / NANOS_PER_SEC;
+  else
+    *st_mtim = stat.st_mtim / NANOS_PER_SEC;
+
+  return UVWASI_ESUCCESS;
+}
+
 static void* default_malloc(size_t size, void* mem_user_data) {
   return malloc(size);
 }
@@ -308,6 +380,23 @@ void uvwasi_destroy(uvwasi_t* uvwasi) {
 }
 
 
+void uvwasi_options_init(uvwasi_options_t* options) {
+  if (options == NULL)
+    return;
+
+  options->in = 0;
+  options->out = 1;
+  options->err = 2;
+  options->fd_table_size = 3;
+  options->argc = 0;
+  options->argv = NULL;
+  options->envp = NULL;
+  options->preopenc = 0;
+  options->preopens = NULL;
+  options->allocator = NULL;
+}
+
+
 uvwasi_errno_t uvwasi_embedder_remap_fd(uvwasi_t* uvwasi,
                                         const uvwasi_fd_t fd,
                                         uv_file new_host_fd) {
@@ -330,10 +419,10 @@ uvwasi_errno_t uvwasi_embedder_remap_fd(uvwasi_t* uvwasi,
 uvwasi_errno_t uvwasi_args_get(uvwasi_t* uvwasi, char** argv, char* argv_buf) {
   uvwasi_size_t i;
 
-  DEBUG("uvwasi_args_get(uvwasi=%p, argv=%p, argv_buf=%p)\n",
-        uvwasi,
-        argv,
-        argv_buf);
+  UVWASI_DEBUG("uvwasi_args_get(uvwasi=%p, argv=%p, argv_buf=%p)\n",
+               uvwasi,
+               argv,
+               argv_buf);
 
   if (uvwasi == NULL || argv == NULL || argv_buf == NULL)
     return UVWASI_EINVAL;
@@ -350,10 +439,10 @@ uvwasi_errno_t uvwasi_args_get(uvwasi_t* uvwasi, char** argv, char* argv_buf) {
 uvwasi_errno_t uvwasi_args_sizes_get(uvwasi_t* uvwasi,
                                      uvwasi_size_t* argc,
                                      uvwasi_size_t* argv_buf_size) {
-  DEBUG("uvwasi_args_sizes_get(uvwasi=%p, argc=%p, argv_buf_size=%p)\n",
-        uvwasi,
-        argc,
-        argv_buf_size);
+  UVWASI_DEBUG("uvwasi_args_sizes_get(uvwasi=%p, argc=%p, argv_buf_size=%p)\n",
+               uvwasi,
+               argc,
+               argv_buf_size);
 
   if (uvwasi == NULL || argc == NULL || argv_buf_size == NULL)
     return UVWASI_EINVAL;
@@ -367,10 +456,10 @@ uvwasi_errno_t uvwasi_args_sizes_get(uvwasi_t* uvwasi,
 uvwasi_errno_t uvwasi_clock_res_get(uvwasi_t* uvwasi,
                                     uvwasi_clockid_t clock_id,
                                     uvwasi_timestamp_t* resolution) {
-  DEBUG("uvwasi_clock_res_get(uvwasi=%p, clock_id=%d, resolution=%p)\n",
-        uvwasi,
-        clock_id,
-        resolution);
+  UVWASI_DEBUG("uvwasi_clock_res_get(uvwasi=%p, clock_id=%d, resolution=%p)\n",
+               uvwasi,
+               clock_id,
+               resolution);
 
   if (uvwasi == NULL || resolution == NULL)
     return UVWASI_EINVAL;
@@ -394,12 +483,12 @@ uvwasi_errno_t uvwasi_clock_time_get(uvwasi_t* uvwasi,
                                      uvwasi_clockid_t clock_id,
                                      uvwasi_timestamp_t precision,
                                      uvwasi_timestamp_t* time) {
-  DEBUG("uvwasi_clock_time_get(uvwasi=%p, clock_id=%d, "
-        "precision=%"PRIu64", time=%p)\n",
-        uvwasi,
-        clock_id,
-        precision,
-        time);
+  UVWASI_DEBUG("uvwasi_clock_time_get(uvwasi=%p, clock_id=%d, "
+               "precision=%"PRIu64", time=%p)\n",
+               uvwasi,
+               clock_id,
+               precision,
+               time);
 
   if (uvwasi == NULL || time == NULL)
     return UVWASI_EINVAL;
@@ -425,10 +514,11 @@ uvwasi_errno_t uvwasi_environ_get(uvwasi_t* uvwasi,
                                   char* environ_buf) {
   uvwasi_size_t i;
 
-  DEBUG("uvwasi_environ_get(uvwasi=%p, environment=%p, environ_buf=%p)\n",
-        uvwasi,
-        environment,
-        environ_buf);
+  UVWASI_DEBUG("uvwasi_environ_get(uvwasi=%p, environment=%p, "
+               "environ_buf=%p)\n",
+               uvwasi,
+               environment,
+               environ_buf);
 
   if (uvwasi == NULL || environment == NULL || environ_buf == NULL)
     return UVWASI_EINVAL;
@@ -445,11 +535,11 @@ uvwasi_errno_t uvwasi_environ_get(uvwasi_t* uvwasi,
 uvwasi_errno_t uvwasi_environ_sizes_get(uvwasi_t* uvwasi,
                                         uvwasi_size_t* environ_count,
                                         uvwasi_size_t* environ_buf_size) {
-  DEBUG("uvwasi_environ_sizes_get(uvwasi=%p, environ_count=%p, "
-        "environ_buf_size=%p)\n",
-        uvwasi,
-        environ_count,
-        environ_buf_size);
+  UVWASI_DEBUG("uvwasi_environ_sizes_get(uvwasi=%p, environ_count=%p, "
+               "environ_buf_size=%p)\n",
+               uvwasi,
+               environ_count,
+               environ_buf_size);
 
   if (uvwasi == NULL || environ_count == NULL || environ_buf_size == NULL)
     return UVWASI_EINVAL;
@@ -472,13 +562,13 @@ uvwasi_errno_t uvwasi_fd_advise(uvwasi_t* uvwasi,
   int r;
 #endif /* POSIX_FADV_NORMAL */
 
-  DEBUG("uvwasi_fd_advise(uvwasi=%p, fd=%d, offset=%"PRIu64", len=%"PRIu64", "
-        "advice=%d)\n",
-        uvwasi,
-        fd,
-        offset,
-        len,
-        advice);
+  UVWASI_DEBUG("uvwasi_fd_advise(uvwasi=%p, fd=%d, offset=%"PRIu64", "
+               "len=%"PRIu64", advice=%d)\n",
+               uvwasi,
+               fd,
+               offset,
+               len,
+               advice);
 
   if (uvwasi == NULL)
     return UVWASI_EINVAL;
@@ -546,12 +636,12 @@ uvwasi_errno_t uvwasi_fd_allocate(uvwasi_t* uvwasi,
   uvwasi_errno_t err;
   int r;
 
-  DEBUG("uvwasi_fd_allocate(uvwasi=%p, fd=%d, offset=%"PRIu64", "
-        "len=%"PRIu64")\n",
-        uvwasi,
-        fd,
-        offset,
-        len);
+  UVWASI_DEBUG("uvwasi_fd_allocate(uvwasi=%p, fd=%d, offset=%"PRIu64", "
+               "len=%"PRIu64")\n",
+               uvwasi,
+               fd,
+               offset,
+               len);
 
   if (uvwasi == NULL)
     return UVWASI_EINVAL;
@@ -603,7 +693,7 @@ uvwasi_errno_t uvwasi_fd_close(uvwasi_t* uvwasi, uvwasi_fd_t fd) {
   uv_fs_t req;
   int r;
 
-  DEBUG("uvwasi_fd_close(uvwasi=%p, fd=%d)\n", uvwasi, fd);
+  UVWASI_DEBUG("uvwasi_fd_close(uvwasi=%p, fd=%d)\n", uvwasi, fd);
 
   if (uvwasi == NULL)
     return UVWASI_EINVAL;
@@ -637,7 +727,7 @@ uvwasi_errno_t uvwasi_fd_datasync(uvwasi_t* uvwasi, uvwasi_fd_t fd) {
   uv_fs_t req;
   int r;
 
-  DEBUG("uvwasi_fd_datasync(uvwasi=%p, fd=%d)\n", uvwasi, fd);
+  UVWASI_DEBUG("uvwasi_fd_datasync(uvwasi=%p, fd=%d)\n", uvwasi, fd);
 
   if (uvwasi == NULL)
     return UVWASI_EINVAL;
@@ -670,7 +760,10 @@ uvwasi_errno_t uvwasi_fd_fdstat_get(uvwasi_t* uvwasi,
   int r;
 #endif
 
-  DEBUG("uvwasi_fd_fdstat_get(uvwasi=%p, fd=%d, buf=%p)\n", uvwasi, fd, buf);
+  UVWASI_DEBUG("uvwasi_fd_fdstat_get(uvwasi=%p, fd=%d, buf=%p)\n",
+               uvwasi,
+               fd,
+               buf);
 
   if (uvwasi == NULL || buf == NULL)
     return UVWASI_EINVAL;
@@ -703,10 +796,10 @@ uvwasi_errno_t uvwasi_fd_fdstat_set_flags(uvwasi_t* uvwasi,
                                           uvwasi_fd_t fd,
                                           uvwasi_fdflags_t flags) {
 #ifdef _WIN32
-  DEBUG("uvwasi_fd_fdstat_set_flags(uvwasi=%p, fd=%d, flags=%d)\n",
-        uvwasi,
-        fd,
-        flags);
+  UVWASI_DEBUG("uvwasi_fd_fdstat_set_flags(uvwasi=%p, fd=%d, flags=%d)\n",
+               uvwasi,
+               fd,
+               flags);
 
   /* TODO(cjihrig): Windows is not supported. */
   return UVWASI_ENOSYS;
@@ -716,10 +809,10 @@ uvwasi_errno_t uvwasi_fd_fdstat_set_flags(uvwasi_t* uvwasi,
   int mapped_flags;
   int r;
 
-  DEBUG("uvwasi_fd_fdstat_set_flags(uvwasi=%p, fd=%d, flags=%d)\n",
-        uvwasi,
-        fd,
-        flags);
+  UVWASI_DEBUG("uvwasi_fd_fdstat_set_flags(uvwasi=%p, fd=%d, flags=%d)\n",
+               uvwasi,
+               fd,
+               flags);
 
   if (uvwasi == NULL)
     return UVWASI_EINVAL;
@@ -777,12 +870,12 @@ uvwasi_errno_t uvwasi_fd_fdstat_set_rights(uvwasi_t* uvwasi,
   struct uvwasi_fd_wrap_t* wrap;
   uvwasi_errno_t err;
 
-  DEBUG("uvwasi_fd_fdstat_set_rights(uvwasi=%p, fd=%d, "
-        "fs_rights_base=%"PRIu64", fs_rights_inheriting=%"PRIu64")\n",
-        uvwasi,
-        fd,
-        fs_rights_base,
-        fs_rights_inheriting);
+  UVWASI_DEBUG("uvwasi_fd_fdstat_set_rights(uvwasi=%p, fd=%d, "
+               "fs_rights_base=%"PRIu64", fs_rights_inheriting=%"PRIu64")\n",
+               uvwasi,
+               fd,
+               fs_rights_base,
+               fs_rights_inheriting);
 
   if (uvwasi == NULL)
     return UVWASI_EINVAL;
@@ -820,7 +913,10 @@ uvwasi_errno_t uvwasi_fd_filestat_get(uvwasi_t* uvwasi,
   uvwasi_errno_t err;
   int r;
 
-  DEBUG("uvwasi_fd_filestat_get(uvwasi=%p, fd=%d, buf=%p)\n", uvwasi, fd, buf);
+  UVWASI_DEBUG("uvwasi_fd_filestat_get(uvwasi=%p, fd=%d, buf=%p)\n",
+               uvwasi,
+               fd,
+               buf);
 
   if (uvwasi == NULL || buf == NULL)
     return UVWASI_EINVAL;
@@ -857,10 +953,11 @@ uvwasi_errno_t uvwasi_fd_filestat_set_size(uvwasi_t* uvwasi,
   uvwasi_errno_t err;
   int r;
 
-  DEBUG("uvwasi_fd_filestat_set_size(uvwasi=%p, fd=%d, st_size=%"PRIu64")\n",
-        uvwasi,
-        fd,
-        st_size);
+  UVWASI_DEBUG("uvwasi_fd_filestat_set_size(uvwasi=%p, fd=%d, "
+               "st_size=%"PRIu64")\n",
+               uvwasi,
+               fd,
+               st_size);
 
   if (uvwasi == NULL)
     return UVWASI_EINVAL;
@@ -889,27 +986,25 @@ uvwasi_errno_t uvwasi_fd_filestat_set_times(uvwasi_t* uvwasi,
                                             uvwasi_timestamp_t st_atim,
                                             uvwasi_timestamp_t st_mtim,
                                             uvwasi_fstflags_t fst_flags) {
-  /* TODO(cjihrig): libuv does not currently support nanosecond precision. */
   struct uvwasi_fd_wrap_t* wrap;
+  uvwasi_timestamp_t atim;
+  uvwasi_timestamp_t mtim;
   uv_fs_t req;
   uvwasi_errno_t err;
   int r;
 
-  DEBUG("uvwasi_fd_filestat_set_times(uvwasi=%p, fd=%d, st_atim=%"PRIu64", "
-        "st_mtim=%"PRIu64", fst_flags=%d)\n",
-        uvwasi,
-        fd,
-        st_atim,
-        st_mtim,
-        fst_flags);
+  UVWASI_DEBUG("uvwasi_fd_filestat_set_times(uvwasi=%p, fd=%d, "
+               "st_atim=%"PRIu64", st_mtim=%"PRIu64", fst_flags=%d)\n",
+               uvwasi,
+               fd,
+               st_atim,
+               st_mtim,
+               fst_flags);
 
   if (uvwasi == NULL)
     return UVWASI_EINVAL;
 
-  if (fst_flags & ~(UVWASI_FILESTAT_SET_ATIM | UVWASI_FILESTAT_SET_ATIM_NOW |
-                    UVWASI_FILESTAT_SET_MTIM | UVWASI_FILESTAT_SET_MTIM_NOW)) {
-    return UVWASI_EINVAL;
-  }
+  VALIDATE_FSTFLAGS_OR_RETURN(fst_flags);
 
   err = uvwasi_fd_table_get(uvwasi->fds,
                             fd,
@@ -919,8 +1014,20 @@ uvwasi_errno_t uvwasi_fd_filestat_set_times(uvwasi_t* uvwasi,
   if (err != UVWASI_ESUCCESS)
     return err;
 
-  /* TODO(cjihrig): st_atim and st_mtim should not be unconditionally passed. */
-  r = uv_fs_futime(NULL, &req, wrap->fd, st_atim, st_mtim, NULL);
+  atim = st_atim;
+  mtim = st_mtim;
+  err = uvwasi__get_filestat_set_times(&atim,
+                                       &mtim,
+                                       fst_flags,
+                                       &wrap->fd,
+                                       NULL);
+  if (err != UVWASI_ESUCCESS) {
+    uv_mutex_unlock(&wrap->mutex);
+    return err;
+  }
+
+  /* libuv does not currently support nanosecond precision. */
+  r = uv_fs_futime(NULL, &req, wrap->fd, atim, mtim, NULL);
   uv_mutex_unlock(&wrap->mutex);
   uv_fs_req_cleanup(&req);
 
@@ -944,14 +1051,14 @@ uvwasi_errno_t uvwasi_fd_pread(uvwasi_t* uvwasi,
   size_t uvread;
   int r;
 
-  DEBUG("uvwasi_fd_pread(uvwasi=%p, fd=%d, iovs=%p, iovs_len=%zu, "
-        "offset=%"PRIu64", nread=%p)\n",
-        uvwasi,
-        fd,
-        iovs,
-        iovs_len,
-        offset,
-        nread);
+  UVWASI_DEBUG("uvwasi_fd_pread(uvwasi=%p, fd=%d, iovs=%p, iovs_len=%d, "
+               "offset=%"PRIu64", nread=%p)\n",
+               uvwasi,
+               fd,
+               iovs,
+               iovs_len,
+               offset,
+               nread);
 
   if (uvwasi == NULL || iovs == NULL || nread == NULL)
     return UVWASI_EINVAL;
@@ -990,10 +1097,10 @@ uvwasi_errno_t uvwasi_fd_prestat_get(uvwasi_t* uvwasi,
   struct uvwasi_fd_wrap_t* wrap;
   uvwasi_errno_t err;
 
-  DEBUG("uvwasi_fd_prestat_get(uvwasi=%p, fd=%d, buf=%p)\n",
-        uvwasi,
-        fd,
-        buf);
+  UVWASI_DEBUG("uvwasi_fd_prestat_get(uvwasi=%p, fd=%d, buf=%p)\n",
+               uvwasi,
+               fd,
+               buf);
 
   if (uvwasi == NULL || buf == NULL)
     return UVWASI_EINVAL;
@@ -1023,11 +1130,12 @@ uvwasi_errno_t uvwasi_fd_prestat_dir_name(uvwasi_t* uvwasi,
   uvwasi_errno_t err;
   size_t size;
 
-  DEBUG("uvwasi_fd_prestat_dir_name(uvwasi=%p, fd=%d, path=%p, path_len=%zu)\n",
-        uvwasi,
-        fd,
-        path,
-        path_len);
+  UVWASI_DEBUG("uvwasi_fd_prestat_dir_name(uvwasi=%p, fd=%d, path=%p, "
+               "path_len=%d)\n",
+               uvwasi,
+               fd,
+               path,
+               path_len);
 
   if (uvwasi == NULL || path == NULL)
     return UVWASI_EINVAL;
@@ -1067,14 +1175,14 @@ uvwasi_errno_t uvwasi_fd_pwrite(uvwasi_t* uvwasi,
   size_t uvwritten;
   int r;
 
-  DEBUG("uvwasi_fd_pwrite(uvwasi=%p, fd=%d, iovs=%p, iovs_len=%zu, "
-        "offset=%"PRIu64", nwritten=%p)\n",
-        uvwasi,
-        fd,
-        iovs,
-        iovs_len,
-        offset,
-        nwritten);
+  UVWASI_DEBUG("uvwasi_fd_pwrite(uvwasi=%p, fd=%d, iovs=%p, iovs_len=%d, "
+               "offset=%"PRIu64", nwritten=%p)\n",
+               uvwasi,
+               fd,
+               iovs,
+               iovs_len,
+               offset,
+               nwritten);
 
   if (uvwasi == NULL || iovs == NULL || nwritten == NULL)
     return UVWASI_EINVAL;
@@ -1119,12 +1227,13 @@ uvwasi_errno_t uvwasi_fd_read(uvwasi_t* uvwasi,
   size_t uvread;
   int r;
 
-  DEBUG("uvwasi_fd_read(uvwasi=%p, fd=%d, iovs=%p, iovs_len=%zu, nread=%p)\n",
-        uvwasi,
-        fd,
-        iovs,
-        iovs_len,
-        nread);
+  UVWASI_DEBUG("uvwasi_fd_read(uvwasi=%p, fd=%d, iovs=%p, iovs_len=%d, "
+               "nread=%p)\n",
+               uvwasi,
+               fd,
+               iovs,
+               iovs_len,
+               nread);
 
   if (uvwasi == NULL || iovs == NULL || nread == NULL)
     return UVWASI_EINVAL;
@@ -1174,14 +1283,14 @@ uvwasi_errno_t uvwasi_fd_readdir(uvwasi_t* uvwasi,
   int i;
   int r;
 
-  DEBUG("uvwasi_fd_readdir(uvwasi=%p, fd=%d, buf=%p, buf_len=%zu, "
-        "cookie=%"PRIu64", bufused=%p)\n",
-        uvwasi,
-        fd,
-        buf,
-        buf_len,
-        cookie,
-        bufused);
+  UVWASI_DEBUG("uvwasi_fd_readdir(uvwasi=%p, fd=%d, buf=%p, buf_len=%d, "
+               "cookie=%"PRIu64", bufused=%p)\n",
+               uvwasi,
+               fd,
+               buf,
+               buf_len,
+               cookie,
+               bufused);
 
   if (uvwasi == NULL || buf == NULL || bufused == NULL)
     return UVWASI_EINVAL;
@@ -1305,7 +1414,10 @@ exit:
 uvwasi_errno_t uvwasi_fd_renumber(uvwasi_t* uvwasi,
                                   uvwasi_fd_t from,
                                   uvwasi_fd_t to) {
-  DEBUG("uvwasi_fd_renumber(uvwasi=%p, from=%d, to=%d)\n", uvwasi, from, to);
+  UVWASI_DEBUG("uvwasi_fd_renumber(uvwasi=%p, from=%d, to=%d)\n",
+               uvwasi,
+               from,
+               to);
 
   if (uvwasi == NULL)
     return UVWASI_EINVAL;
@@ -1322,13 +1434,13 @@ uvwasi_errno_t uvwasi_fd_seek(uvwasi_t* uvwasi,
   struct uvwasi_fd_wrap_t* wrap;
   uvwasi_errno_t err;
 
-  DEBUG("uvwasi_fd_seek(uvwasi=%p, fd=%d, offset=%"PRId64", "
-        "whence=%d, newoffset=%p)\n",
-        uvwasi,
-        fd,
-        offset,
-        whence,
-        newoffset);
+  UVWASI_DEBUG("uvwasi_fd_seek(uvwasi=%p, fd=%d, offset=%"PRId64", "
+               "whence=%d, newoffset=%p)\n",
+               uvwasi,
+               fd,
+               offset,
+               whence,
+               newoffset);
 
   if (uvwasi == NULL || newoffset == NULL)
     return UVWASI_EINVAL;
@@ -1349,7 +1461,7 @@ uvwasi_errno_t uvwasi_fd_sync(uvwasi_t* uvwasi, uvwasi_fd_t fd) {
   uvwasi_errno_t err;
   int r;
 
-  DEBUG("uvwasi_fd_sync(uvwasi=%p, fd=%d)\n", uvwasi, fd);
+  UVWASI_DEBUG("uvwasi_fd_sync(uvwasi=%p, fd=%d)\n", uvwasi, fd);
 
   if (uvwasi == NULL)
     return UVWASI_EINVAL;
@@ -1379,7 +1491,10 @@ uvwasi_errno_t uvwasi_fd_tell(uvwasi_t* uvwasi,
   struct uvwasi_fd_wrap_t* wrap;
   uvwasi_errno_t err;
 
-  DEBUG("uvwasi_fd_tell(uvwasi=%p, fd=%d, offset=%p)\n", uvwasi, fd, offset);
+  UVWASI_DEBUG("uvwasi_fd_tell(uvwasi=%p, fd=%d, offset=%p)\n",
+               uvwasi,
+               fd,
+               offset);
 
   if (uvwasi == NULL || offset == NULL)
     return UVWASI_EINVAL;
@@ -1406,13 +1521,13 @@ uvwasi_errno_t uvwasi_fd_write(uvwasi_t* uvwasi,
   size_t uvwritten;
   int r;
 
-  DEBUG("uvwasi_fd_write(uvwasi=%p, fd=%d, iovs=%p, iovs_len=%zu, "
-        "nwritten=%p)\n",
-        uvwasi,
-        fd,
-        iovs,
-        iovs_len,
-        nwritten);
+  UVWASI_DEBUG("uvwasi_fd_write(uvwasi=%p, fd=%d, iovs=%p, iovs_len=%d, "
+               "nwritten=%p)\n",
+               uvwasi,
+               fd,
+               iovs,
+               iovs_len,
+               nwritten);
 
   if (uvwasi == NULL || iovs == NULL || nwritten == NULL)
     return UVWASI_EINVAL;
@@ -1451,12 +1566,12 @@ uvwasi_errno_t uvwasi_path_create_directory(uvwasi_t* uvwasi,
   uvwasi_errno_t err;
   int r;
 
-  DEBUG("uvwasi_path_create_directory(uvwasi=%p, fd=%d, path='%s', "
-        "path_len=%zu)\n",
-        uvwasi,
-        fd,
-        path,
-        path_len);
+  UVWASI_DEBUG("uvwasi_path_create_directory(uvwasi=%p, fd=%d, path='%s', "
+               "path_len=%d)\n",
+               uvwasi,
+               fd,
+               path,
+               path_len);
 
   if (uvwasi == NULL || path == NULL)
     return UVWASI_EINVAL;
@@ -1501,14 +1616,14 @@ uvwasi_errno_t uvwasi_path_filestat_get(uvwasi_t* uvwasi,
   uvwasi_errno_t err;
   int r;
 
-  DEBUG("uvwasi_path_filestat_get(uvwasi=%p, fd=%d, flags=%d, path='%s', "
-        "path_len=%zu, buf=%p)\n",
-        uvwasi,
-        fd,
-        flags,
-        path,
-        path_len,
-        buf);
+  UVWASI_DEBUG("uvwasi_path_filestat_get(uvwasi=%p, fd=%d, flags=%d, "
+               "path='%s', path_len=%d, buf=%p)\n",
+               uvwasi,
+               fd,
+               flags,
+               path,
+               path_len,
+               buf);
 
   if (uvwasi == NULL || path == NULL || buf == NULL)
     return UVWASI_EINVAL;
@@ -1530,7 +1645,7 @@ uvwasi_errno_t uvwasi_path_filestat_get(uvwasi_t* uvwasi,
   if (err != UVWASI_ESUCCESS)
     goto exit;
 
-  r = uv_fs_stat(NULL, &req, resolved_path, NULL);
+  r = uv_fs_lstat(NULL, &req, resolved_path, NULL);
   uvwasi__free(uvwasi, resolved_path);
   if (r != 0) {
     uv_fs_req_cleanup(&req);
@@ -1555,31 +1670,30 @@ uvwasi_errno_t uvwasi_path_filestat_set_times(uvwasi_t* uvwasi,
                                               uvwasi_timestamp_t st_atim,
                                               uvwasi_timestamp_t st_mtim,
                                               uvwasi_fstflags_t fst_flags) {
-  /* TODO(cjihrig): libuv does not currently support nanosecond precision. */
   char* resolved_path;
   struct uvwasi_fd_wrap_t* wrap;
+  uvwasi_timestamp_t atim;
+  uvwasi_timestamp_t mtim;
   uv_fs_t req;
   uvwasi_errno_t err;
   int r;
 
-  DEBUG("uvwasi_path_filestat_set_times(uvwasi=%p, fd=%d, flags=%d, path='%s', "
-        "path_len=%zu, st_atim=%"PRIu64", st_mtim=%"PRIu64", fst_flags=%d)\n",
-        uvwasi,
-        fd,
-        flags,
-        path,
-        path_len,
-        st_atim,
-        st_mtim,
-        fst_flags);
+  UVWASI_DEBUG("uvwasi_path_filestat_set_times(uvwasi=%p, fd=%d, "
+               "flags=%d, path='%s', path_len=%d, "
+               "st_atim=%"PRIu64", st_mtim=%"PRIu64", fst_flags=%d)\n",
+               uvwasi,
+               fd,
+               flags,
+               path,
+               path_len,
+               st_atim,
+               st_mtim,
+               fst_flags);
 
   if (uvwasi == NULL || path == NULL)
     return UVWASI_EINVAL;
 
-  if (fst_flags & ~(UVWASI_FILESTAT_SET_ATIM | UVWASI_FILESTAT_SET_ATIM_NOW |
-                    UVWASI_FILESTAT_SET_MTIM | UVWASI_FILESTAT_SET_MTIM_NOW)) {
-    return UVWASI_EINVAL;
-  }
+  VALIDATE_FSTFLAGS_OR_RETURN(fst_flags);
 
   err = uvwasi_fd_table_get(uvwasi->fds,
                             fd,
@@ -1598,8 +1712,20 @@ uvwasi_errno_t uvwasi_path_filestat_set_times(uvwasi_t* uvwasi,
   if (err != UVWASI_ESUCCESS)
     goto exit;
 
-  /* TODO(cjihrig): st_atim and st_mtim should not be unconditionally passed. */
-  r = uv_fs_utime(NULL, &req, resolved_path, st_atim, st_mtim, NULL);
+  atim = st_atim;
+  mtim = st_mtim;
+  err = uvwasi__get_filestat_set_times(&atim,
+                                       &mtim,
+                                       fst_flags,
+                                       NULL,
+                                       resolved_path);
+  if (err != UVWASI_ESUCCESS) {
+    uvwasi__free(uvwasi, resolved_path);
+    goto exit;
+  }
+
+  /* libuv does not currently support nanosecond precision. */
+  r = uv_fs_lutime(NULL, &req, resolved_path, atim, mtim, NULL);
   uvwasi__free(uvwasi, resolved_path);
   uv_fs_req_cleanup(&req);
 
@@ -1631,16 +1757,17 @@ uvwasi_errno_t uvwasi_path_link(uvwasi_t* uvwasi,
   uv_fs_t req;
   int r;
 
-  DEBUG("uvwasi_path_link(uvwasi=%p, old_fd=%d, old_flags=%d, old_path='%s', "
-        "old_path_len=%zu, new_fd=%d, new_path='%s', new_path_len=%zu)\n",
-        uvwasi,
-        old_fd,
-        old_flags,
-        old_path,
-        old_path_len,
-        new_fd,
-        new_path,
-        new_path_len);
+  UVWASI_DEBUG("uvwasi_path_link(uvwasi=%p, old_fd=%d, old_flags=%d, "
+               "old_path='%s', old_path_len=%d, new_fd=%d, new_path='%s', "
+               "new_path_len=%d)\n",
+               uvwasi,
+               old_fd,
+               old_flags,
+               old_path,
+               old_path_len,
+               new_fd,
+               new_path,
+               new_path_len);
 
   if (uvwasi == NULL || old_path == NULL || new_path == NULL)
     return UVWASI_EINVAL;
@@ -1745,19 +1872,19 @@ uvwasi_errno_t uvwasi_path_open(uvwasi_t* uvwasi,
   int write;
   int r;
 
-  DEBUG("uvwasi_path_open(uvwasi=%p, dirfd=%d, dirflags=%d, path='%s', "
-        "path_len=%zu, o_flags=%d, fs_rights_base=%"PRIu64", "
-        "fs_rights_inheriting=%"PRIu64", fs_flags=%d, fd=%p)\n",
-        uvwasi,
-        dirfd,
-        dirflags,
-        path,
-        path_len,
-        o_flags,
-        fs_rights_base,
-        fs_rights_inheriting,
-        fs_flags,
-        fd);
+  UVWASI_DEBUG("uvwasi_path_open(uvwasi=%p, dirfd=%d, dirflags=%d, path='%s', "
+               "path_len=%d, o_flags=%d, fs_rights_base=%"PRIu64", "
+               "fs_rights_inheriting=%"PRIu64", fs_flags=%d, fd=%p)\n",
+               uvwasi,
+               dirfd,
+               dirflags,
+               path,
+               path_len,
+               o_flags,
+               fs_rights_base,
+               fs_rights_inheriting,
+               fs_flags,
+               fd);
 
   if (uvwasi == NULL || path == NULL || fd == NULL)
     return UVWASI_EINVAL;
@@ -1892,15 +2019,15 @@ uvwasi_errno_t uvwasi_path_readlink(uvwasi_t* uvwasi,
   size_t len;
   int r;
 
-  DEBUG("uvwasi_path_readlink(uvwasi=%p, fd=%d, path='%s', path_len=%zu, "
-        "buf=%p, buf_len=%zu, bufused=%p)\n",
-        uvwasi,
-        fd,
-        path,
-        path_len,
-        buf,
-        buf_len,
-        bufused);
+  UVWASI_DEBUG("uvwasi_path_readlink(uvwasi=%p, fd=%d, path='%s', path_len=%d, "
+               "buf=%p, buf_len=%d, bufused=%p)\n",
+               uvwasi,
+               fd,
+               path,
+               path_len,
+               buf,
+               buf_len,
+               bufused);
 
   if (uvwasi == NULL || path == NULL || buf == NULL || bufused == NULL)
     return UVWASI_EINVAL;
@@ -1951,12 +2078,12 @@ uvwasi_errno_t uvwasi_path_remove_directory(uvwasi_t* uvwasi,
   uvwasi_errno_t err;
   int r;
 
-  DEBUG("uvwasi_path_remove_directory(uvwasi=%p, fd=%d, path='%s', "
-        "path_len=%zu)\n",
-        uvwasi,
-        fd,
-        path,
-        path_len);
+  UVWASI_DEBUG("uvwasi_path_remove_directory(uvwasi=%p, fd=%d, path='%s', "
+               "path_len=%d)\n",
+               uvwasi,
+               fd,
+               path,
+               path_len);
 
   if (uvwasi == NULL || path == NULL)
     return UVWASI_EINVAL;
@@ -2002,15 +2129,15 @@ uvwasi_errno_t uvwasi_path_rename(uvwasi_t* uvwasi,
   uv_fs_t req;
   int r;
 
-  DEBUG("uvwasi_path_rename(uvwasi=%p, old_fd=%d, old_path='%s', "
-        "old_path_len=%zu, new_fd=%d, new_path='%s', new_path_len=%zu)\n",
-        uvwasi,
-        old_fd,
-        old_path,
-        old_path_len,
-        new_fd,
-        new_path,
-        new_path_len);
+  UVWASI_DEBUG("uvwasi_path_rename(uvwasi=%p, old_fd=%d, old_path='%s', "
+               "old_path_len=%d, new_fd=%d, new_path='%s', new_path_len=%d)\n",
+               uvwasi,
+               old_fd,
+               old_path,
+               old_path_len,
+               new_fd,
+               new_path,
+               new_path_len);
 
   if (uvwasi == NULL || old_path == NULL || new_path == NULL)
     return UVWASI_EINVAL;
@@ -2102,14 +2229,14 @@ uvwasi_errno_t uvwasi_path_symlink(uvwasi_t* uvwasi,
   uv_fs_t req;
   int r;
 
-  DEBUG("uvwasi_path_symlink(uvwasi=%p, old_path='%s', old_path_len=%zu, "
-        "fd=%d, new_path='%s', new_path_len=%zu)\n",
-        uvwasi,
-        old_path,
-        old_path_len,
-        fd,
-        new_path,
-        new_path_len);
+  UVWASI_DEBUG("uvwasi_path_symlink(uvwasi=%p, old_path='%s', old_path_len=%d, "
+               "fd=%d, new_path='%s', new_path_len=%d)\n",
+               uvwasi,
+               old_path,
+               old_path_len,
+               fd,
+               new_path,
+               new_path_len);
 
   if (uvwasi == NULL || old_path == NULL || new_path == NULL)
     return UVWASI_EINVAL;
@@ -2155,11 +2282,12 @@ uvwasi_errno_t uvwasi_path_unlink_file(uvwasi_t* uvwasi,
   uvwasi_errno_t err;
   int r;
 
-  DEBUG("uvwasi_path_unlink_file(uvwasi=%p, fd=%d, path='%s', path_len=%zu)\n",
-        uvwasi,
-        fd,
-        path,
-        path_len);
+  UVWASI_DEBUG("uvwasi_path_unlink_file(uvwasi=%p, fd=%d, path='%s', "
+               "path_len=%d)\n",
+               uvwasi,
+               fd,
+               path,
+               path_len);
 
   if (uvwasi == NULL || path == NULL)
     return UVWASI_EINVAL;
@@ -2207,13 +2335,13 @@ uvwasi_errno_t uvwasi_poll_oneoff(uvwasi_t* uvwasi,
   int has_timeout;
   uvwasi_size_t i;
 
-  DEBUG("uvwasi_poll_oneoff(uvwasi=%p, in=%p, out=%p, nsubscriptions=%zu, "
-        "nevents=%p)\n",
-        uvwasi,
-        in,
-        out,
-        nsubscriptions,
-        nevents);
+  UVWASI_DEBUG("uvwasi_poll_oneoff(uvwasi=%p, in=%p, out=%p, "
+               "nsubscriptions=%d, nevents=%p)\n",
+               uvwasi,
+               in,
+               out,
+               nsubscriptions,
+               nevents);
 
   if (uvwasi == NULL || in == NULL || out == NULL ||
       nsubscriptions == 0 || nevents == NULL) {
@@ -2313,7 +2441,7 @@ exit:
 
 
 uvwasi_errno_t uvwasi_proc_exit(uvwasi_t* uvwasi, uvwasi_exitcode_t rval) {
-  DEBUG("uvwasi_proc_exit(uvwasi=%p, rval=%d)\n", uvwasi, rval);
+  UVWASI_DEBUG("uvwasi_proc_exit(uvwasi=%p, rval=%d)\n", uvwasi, rval);
   exit(rval);
   return UVWASI_ESUCCESS; /* This doesn't happen. */
 }
@@ -2322,7 +2450,7 @@ uvwasi_errno_t uvwasi_proc_exit(uvwasi_t* uvwasi, uvwasi_exitcode_t rval) {
 uvwasi_errno_t uvwasi_proc_raise(uvwasi_t* uvwasi, uvwasi_signal_t sig) {
   int r;
 
-  DEBUG("uvwasi_proc_raise(uvwasi=%p, sig=%d)\n", uvwasi, sig);
+  UVWASI_DEBUG("uvwasi_proc_raise(uvwasi=%p, sig=%d)\n", uvwasi, sig);
 
   if (uvwasi == NULL)
     return UVWASI_EINVAL;
@@ -2344,10 +2472,10 @@ uvwasi_errno_t uvwasi_random_get(uvwasi_t* uvwasi,
                                  uvwasi_size_t buf_len) {
   int r;
 
-  DEBUG("uvwasi_random_get(uvwasi=%p, buf=%p, buf_len=%zu)\n",
-        uvwasi,
-        buf,
-        buf_len);
+  UVWASI_DEBUG("uvwasi_random_get(uvwasi=%p, buf=%p, buf_len=%d)\n",
+               uvwasi,
+               buf,
+               buf_len);
 
   if (uvwasi == NULL || buf == NULL)
     return UVWASI_EINVAL;
@@ -2361,7 +2489,7 @@ uvwasi_errno_t uvwasi_random_get(uvwasi_t* uvwasi,
 
 
 uvwasi_errno_t uvwasi_sched_yield(uvwasi_t* uvwasi) {
-  DEBUG("uvwasi_sched_yield(uvwasi=%p)\n", uvwasi);
+  UVWASI_DEBUG("uvwasi_sched_yield(uvwasi=%p)\n", uvwasi);
 
   if (uvwasi == NULL)
     return UVWASI_EINVAL;
@@ -2386,7 +2514,7 @@ uvwasi_errno_t uvwasi_sock_recv(uvwasi_t* uvwasi,
                                 uvwasi_roflags_t* ro_flags) {
   /* TODO(cjihrig): Waiting to implement, pending
                     https://github.com/WebAssembly/WASI/issues/4 */
-  DEBUG("uvwasi_sock_recv(uvwasi=%p, unimplemented)\n", uvwasi);
+  UVWASI_DEBUG("uvwasi_sock_recv(uvwasi=%p, unimplemented)\n", uvwasi);
   return UVWASI_ENOTSUP;
 }
 
@@ -2399,7 +2527,7 @@ uvwasi_errno_t uvwasi_sock_send(uvwasi_t* uvwasi,
                                 uvwasi_size_t* so_datalen) {
   /* TODO(cjihrig): Waiting to implement, pending
                     https://github.com/WebAssembly/WASI/issues/4 */
-  DEBUG("uvwasi_sock_send(uvwasi=%p, unimplemented)\n", uvwasi);
+  UVWASI_DEBUG("uvwasi_sock_send(uvwasi=%p, unimplemented)\n", uvwasi);
   return UVWASI_ENOTSUP;
 }
 
@@ -2409,7 +2537,7 @@ uvwasi_errno_t uvwasi_sock_shutdown(uvwasi_t* uvwasi,
                                     uvwasi_sdflags_t how) {
   /* TODO(cjihrig): Waiting to implement, pending
                     https://github.com/WebAssembly/WASI/issues/4 */
-  DEBUG("uvwasi_sock_shutdown(uvwasi=%p, unimplemented)\n", uvwasi);
+  UVWASI_DEBUG("uvwasi_sock_shutdown(uvwasi=%p, unimplemented)\n", uvwasi);
   return UVWASI_ENOTSUP;
 }