Merge pull request #767 from squeek502/libuv-1.51.0

Bump Libuv to 1.51.0

Author: squeek502

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10)
 project (luv C ASM)
 
 set(LUV_VERSION_MAJOR 1)
-set(LUV_VERSION_MINOR 50)
+set(LUV_VERSION_MINOR 51)
 set(LUV_VERSION_PATCH 0)
 set(LUV_VERSION ${LUV_VERSION_MAJOR}.${LUV_VERSION_MINOR}.${LUV_VERSION_PATCH})
 

deps/libuv

@@ -321,6 +321,11 @@ local constants = {
     { 'TTY_MODE_NORMAL', 'normal' },
     { 'TTY_MODE_RAW', 'raw' },
     { 'TTY_MODE_IO', 'io' },
+    { 'TTY_MODE_RAW_VT', 'raw_vt' },
+  },
+  fs_utime = {
+    { 'FS_UTIME_NOW', 'now' },
+    { 'FS_UTIME_OMIT', 'omit' },
   },
 }
 
@@ -617,6 +622,10 @@ local doc = {
           title = 'TTY Modes',
           constants = constants.tty_modes,
         },
+        {
+          title = 'FS Modification Times',
+          constants = constants.fs_utime,
+        },
       },
     },
     {
@@ -3595,35 +3604,65 @@ local doc = {
         },
         {
           name = 'fs_utime',
-          desc = 'Equivalent to `utime(2)`.',
+          desc = [[
+              Equivalent to `utime(2)`.
+
+              See [Constants][] for supported FS Modification Time constants.
+
+              Passing `"now"` or `uv.constants.FS_UTIME_NOW` as the atime or mtime sets the timestamp to the
+              current time.
+
+              Passing `nil`, `"omit"`, or `uv.constants.FS_UTIME_OMIT` as the atime or mtime leaves the timestamp
+              untouched.
+            ]],
           params = {
             { name = 'path', type = 'string' },
-            { name = 'atime', type = 'number' },
-            { name = 'mtime', type = 'number' },
+            { name = 'atime', type = opt(union('number', 'string')) },
+            { name = 'mtime', type = opt(union('number', 'string')) },
             async_cb(),
           },
           returns_sync = ret_or_fail('boolean', 'success'),
           returns_async = 'uv_fs_t',
         },
         {
           name = 'fs_futime',
-          desc = 'Equivalent to `futime(2)`.',
+          desc = [[
+              Equivalent to `futimes(3)`.
+
+              See [Constants][] for supported FS Modification Time constants.
+
+              Passing `"now"` or `uv.constants.FS_UTIME_NOW` as the atime or mtime sets the timestamp to the
+              current time.
+
+              Passing `nil`, `"omit"`, or `uv.constants.FS_UTIME_OMIT` as the atime or mtime leaves the timestamp
+              untouched.
+            ]],
           params = {
             { name = 'fd', type = 'integer' },
-            { name = 'atime', type = 'number' },
-            { name = 'mtime', type = 'number' },
+            { name = 'atime', type = opt(union('number', 'string')) },
+            { name = 'mtime', type = opt(union('number', 'string')) },
             async_cb(),
           },
           returns_sync = ret_or_fail('boolean', 'success'),
           returns_async = 'uv_fs_t',
         },
         {
           name = 'fs_lutime',
-          desc = 'Equivalent to `lutime(2)`.',
+          desc = [[
+              Equivalent to `lutimes(3)`.
+
+              See [Constants][] for supported FS Modification Time constants.
+
+              Passing `"now"` or `uv.constants.FS_UTIME_NOW` as the atime or mtime sets the timestamp to the
+              current time.
+
+              Passing `nil`, `"omit"`, or `uv.constants.FS_UTIME_OMIT` as the atime or mtime leaves the timestamp
+              untouched.
+            ]],
           params = {
             { name = 'path', type = 'string' },
-            { name = 'atime', type = 'number' },
-            { name = 'mtime', type = 'number' },
+            { name = 'atime', type = opt(union('number', 'string')) },
+            { name = 'mtime', type = opt(union('number', 'string')) },
             async_cb(),
           },
           returns_sync = ret_or_fail('boolean', 'success'),

docs.lua

@@ -355,6 +355,10 @@ static int luv_constants(lua_State* L) {
   lua_setfield(L, -2, "TTY_MODE_RAW");
   lua_pushinteger(L, UV_TTY_MODE_IO);
   lua_setfield(L, -2, "TTY_MODE_IO");
+#if LUV_UV_VERSION_GEQ(1, 51, 0)
+  lua_pushinteger(L, UV_TTY_MODE_RAW_VT);
+  lua_setfield(L, -2, "TTY_MODE_RAW_VT");
+#endif
 #endif
 
 #if LUV_UV_VERSION_GEQ(1, 48, 0)
@@ -370,6 +374,13 @@ static int luv_constants(lua_State* L) {
   lua_setfield(L, -2, "THREAD_PRIORITY_LOWEST");
 #endif
 
+#if LUV_UV_VERSION_GEQ(1, 51, 0)
+  lua_pushnumber(L, UV_FS_UTIME_NOW);
+  lua_setfield(L, -2, "FS_UTIME_NOW");
+  lua_pushnumber(L, UV_FS_UTIME_OMIT);
+  lua_setfield(L, -2, "FS_UTIME_OMIT");
+#endif
+
   return 1;
 }
 

docs.md

@@ -779,11 +779,25 @@ static int luv_fs_fchmod(lua_State* L) {
   FS_CALL(uv_fs_fchmod, req, file, mode);
 }
 
+static double luv_fs_check_modification_time(lua_State* L, int index) {
+#if LUV_UV_VERSION_GEQ(1, 51, 0)
+  const char* special_value_strings[] = { "now", "omit", NULL};
+  double special_values[] = { UV_FS_UTIME_NOW, UV_FS_UTIME_OMIT };
+  if (lua_isnoneornil(L, index)) return UV_FS_UTIME_OMIT;
+  if (lua_isnumber(L, index)) return lua_tonumber(L, index);
+
+  int special_value_index = luaL_checkoption(L, index, NULL, special_value_strings);
+  return special_values[special_value_index];
+#else
+  return luaL_checknumber(L, index);
+#endif
+}
+
 static int luv_fs_utime(lua_State* L) {
   luv_ctx_t* ctx = luv_context(L);
   const char* path = luaL_checkstring(L, 1);
-  double atime = luaL_checknumber(L, 2);
-  double mtime = luaL_checknumber(L, 3);
+  double atime = luv_fs_check_modification_time(L, 2);
+  double mtime = luv_fs_check_modification_time(L, 3);
   int ref = luv_check_continuation(L, 4);
   uv_fs_t* req = (uv_fs_t*)lua_newuserdata(L, uv_req_size(UV_FS));
   req->data = luv_setup_req(L, ctx, ref);
@@ -793,8 +807,8 @@ static int luv_fs_utime(lua_State* L) {
 static int luv_fs_futime(lua_State* L) {
   luv_ctx_t* ctx = luv_context(L);
   uv_file file = luaL_checkinteger(L, 1);
-  double atime = luaL_checknumber(L, 2);
-  double mtime = luaL_checknumber(L, 3);
+  double atime = luv_fs_check_modification_time(L, 2);
+  double mtime = luv_fs_check_modification_time(L, 3);
   int ref = luv_check_continuation(L, 4);
   uv_fs_t* req = (uv_fs_t*)lua_newuserdata(L, uv_req_size(UV_FS));
   req->data = luv_setup_req(L, ctx, ref);
@@ -805,8 +819,8 @@ static int luv_fs_futime(lua_State* L) {
 static int luv_fs_lutime(lua_State* L) {
   luv_ctx_t* ctx = luv_context(L);
   const char* path = luaL_checkstring(L, 1);
-  double atime = luaL_checknumber(L, 2);
-  double mtime = luaL_checknumber(L, 3);
+  double atime = luv_fs_check_modification_time(L, 2);
+  double mtime = luv_fs_check_modification_time(L, 3);
   int ref = luv_check_continuation(L, 4);
   uv_fs_t* req = (uv_fs_t*)lua_newuserdata(L, uv_req_size(UV_FS));
   req->data = luv_setup_req(L, ctx, ref);

meta.lua

@@ -40,15 +40,22 @@ static int luv_new_tty(lua_State* L) {
 }
 
 static int luv_check_tty_mode(lua_State *L, int i) {
+#if LUV_UV_VERSION_GEQ(1, 51, 0)
+  const char* modes[] = { "normal", "raw", "io", "raw_vt", NULL};
+#else
   const char* modes[] = { "normal", "raw", "io", NULL};
+#endif
   int mode;
 
   if (lua_isnumber(L, i))
     mode = lua_tonumber(L, i);
   else
     mode = luaL_checkoption(L, i, NULL, modes);
 
-#if LUV_UV_VERSION_GEQ(1, 2, 0)
+#if LUV_UV_VERSION_GEQ(1, 51, 0)
+  luaL_argcheck(L, mode >= UV_TTY_MODE_NORMAL && mode <= UV_TTY_MODE_RAW_VT,
+      i, "Unknown tty mode value");
+#elif LUV_UV_VERSION_GEQ(1, 2, 0)
   luaL_argcheck(L, mode >= UV_TTY_MODE_NORMAL && mode <= UV_TTY_MODE_IO,
       i, "Unknown tty mode value");
 #endif