Merge pull request #479 from squeek502/libuv-1.36.0

Update to libuv 1.36.0
luvit · Apr 16, 2020 · b492e5d · b492e5d
2 parents af38d9e + aa772a7
commit b492e5d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ endif()
 project (luv C ASM)
 
 set(LUV_VERSION_MAJOR 1)
-set(LUV_VERSION_MINOR 35)
+set(LUV_VERSION_MINOR 36)
 set(LUV_VERSION_PATCH 0)
 set(LUV_VERSION ${LUV_VERSION_MAJOR}.${LUV_VERSION_MINOR}.${LUV_VERSION_PATCH})
 

diff --git a/deps/libuv b/deps/libuv
diff --git a/src/fs.c b/src/fs.c
@@ -249,6 +249,9 @@ static int push_fs_result(lua_State* L, uv_fs_t* req) {
 #endif
     case UV_FS_UTIME:
     case UV_FS_FUTIME:
+#if LUV_UV_VERSION_GEQ(1, 36, 0)
+    case UV_FS_LUTIME:
+#endif
 #if LUV_UV_VERSION_GEQ(1, 14, 0)
     case UV_FS_COPYFILE:
 #endif
@@ -678,6 +681,19 @@ static int luv_fs_futime(lua_State* L) {
   FS_CALL(futime, req, file, atime, mtime);
 }
 
+#if LUV_UV_VERSION_GEQ(1, 36, 0)
+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);
+  int ref = luv_check_continuation(L, 4);
+  uv_fs_t* req = (uv_fs_t*)lua_newuserdata(L, sizeof(*req));
+  req->data = luv_setup_req(L, ctx, ref);
+  FS_CALL(lutime, req, path, atime, mtime);
+}
+#endif
+
 static int luv_fs_link(lua_State* L) {
   luv_ctx_t* ctx = luv_context(L);
   const char* path = luaL_checkstring(L, 1);

diff --git a/src/luv.c b/src/luv.c
@@ -237,6 +237,9 @@ static const luaL_Reg luv_functions[] = {
   {"fs_fchmod", luv_fs_fchmod},
   {"fs_utime", luv_fs_utime},
   {"fs_futime", luv_fs_futime},
+#if LUV_UV_VERSION_GEQ(1, 36, 0)
+  {"fs_lutime", luv_fs_lutime},
+#endif
   {"fs_link", luv_fs_link},
   {"fs_symlink", luv_fs_symlink},
   {"fs_readlink", luv_fs_readlink},
+0 −5		.gitignore
+1 −0		.mailmap
+6 −0		AUTHORS
+61 −7		CMakeLists.txt
+0 −1		CONTRIBUTING.md
+72 −1		ChangeLog
+3 −10		Makefile.am
+47 −168		README.md
+3 −2		SUPPORTED_PLATFORMS.md
+0 −23		android-configure-arm
+0 −23		android-configure-arm64
+0 −23		android-configure-x86
+0 −25		android-configure-x86_64
+0 −32		appveyor.yml
+0 −213		common.gypi
+1 −1		configure.ac
+10 −4		docs/src/fs.rst
+10 −0		docs/src/misc.rst
+12 −5		docs/src/udp.rst
+0 −73		gyp_uv.py
+25 −9		include/uv.h
+2 −2		include/uv/version.h
+2 −1		src/unix/android-ifaddrs.c
+2 −0		src/unix/atomic-ops.h
+7 −6		src/unix/core.c
+63 −23		src/unix/fs.c
+2 −4		src/unix/openbsd.c
+62 −5		src/unix/os390-syscalls.c
+6 −0		src/unix/os390-syscalls.h
+1 −1		src/unix/os390.c
+1 −1		src/unix/posix-poll.c
+28 −7		src/unix/tty.c
+7 −6		src/unix/udp.c
+11 −0		src/uv-common.c
+1 −0		src/uv-common.h
+116 −14		src/win/fs.c
+4 −5		src/win/process.c
+5 −5		src/win/util.c
+0 −12		src/win/winapi.c
+0 −8		src/win/winapi.h
+1 −2		test/run-benchmarks.c
+1 −3		test/run-tests.c
+3 −9		test/runner-unix.c
+1 −3		test/runner-win.c
+1 −5		test/runner.h
+114 −0		test/task.h
+1 −2		test/test-cwd-and-chdir.c
+107 −7		test/test-fs.c
+11 −10		test/test-get-currentexe.c
+1 −1		test/test-gethostname.c
+1 −1		test/test-homedir.c
+163 −158		test/test-ipc.c
+2 −0		test/test-list.h
+13 −4		test/test-process-title-threadsafe.c
+4 −3		test/test-spawn.c
+1 −1		test/test-tmpdir.c
+2 −0		test/test-tty.c
+0 −295		test/test.gyp
+0 −368		uv.gyp
+0 −184		vcbuild.bat