From c3e209ec3cc55c92e6c5f16a7502d0c9639778a7 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Thu, 9 Feb 2023 01:37:14 +0700 Subject: [PATCH 1/3] fs: fix libuv for <10.7 --- src/libuv-1.44.2/src/unix/darwin-proctitle.c | 2 ++ src/libuv-1.44.2/src/unix/fs.c | 4 ++-- src/libuv-1.44.2/src/unix/process.c | 8 ++++++-- src/libuv-1.44.2/src/unix/tty.c | 2 +- src/libuv-1.44.2/src/unix/udp.c | 2 ++ 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/libuv-1.44.2/src/unix/darwin-proctitle.c b/src/libuv-1.44.2/src/unix/darwin-proctitle.c index 5288083e..c1aa0531 100644 --- a/src/libuv-1.44.2/src/unix/darwin-proctitle.c +++ b/src/libuv-1.44.2/src/unix/darwin-proctitle.c @@ -41,9 +41,11 @@ static int uv__pthread_setname_np(const char* name) { strncpy(namebuf, name, sizeof(namebuf) - 1); namebuf[sizeof(namebuf) - 1] = '\0'; +#if TARGET_OS_IPHONE || (MAC_OS_X_VERSION_MIN_REQUIRED >= 1060) err = pthread_setname_np(namebuf); if (err) return UV__ERR(err); +#endif return 0; } diff --git a/src/libuv-1.44.2/src/unix/fs.c b/src/libuv-1.44.2/src/unix/fs.c index 933c9c0d..aae15f01 100644 --- a/src/libuv-1.44.2/src/unix/fs.c +++ b/src/libuv-1.44.2/src/unix/fs.c @@ -1061,7 +1061,7 @@ static ssize_t uv__fs_sendfile(uv_fs_t* req) { return -1; } -#elif defined(__APPLE__) || \ +#elif (defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1050)) || \ defined(__DragonFly__) || \ defined(__FreeBSD__) || \ defined(__FreeBSD_kernel__) @@ -1441,7 +1441,7 @@ static void uv__to_stat(struct stat* src, uv_stat_t* dst) { dst->st_blksize = src->st_blksize; dst->st_blocks = src->st_blocks; -#if defined(__APPLE__) +#if defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 1050) dst->st_atim.tv_sec = src->st_atimespec.tv_sec; dst->st_atim.tv_nsec = src->st_atimespec.tv_nsec; dst->st_mtim.tv_sec = src->st_mtimespec.tv_sec; diff --git a/src/libuv-1.44.2/src/unix/process.c b/src/libuv-1.44.2/src/unix/process.c index f8415368..2a20b21c 100644 --- a/src/libuv-1.44.2/src/unix/process.c +++ b/src/libuv-1.44.2/src/unix/process.c @@ -36,7 +36,9 @@ #include #if defined(__APPLE__) +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 # include +#endif # include # include # include @@ -387,7 +389,7 @@ static void uv__process_child_init(const uv_process_options_t* options, #endif -#if defined(__APPLE__) +#if defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050) typedef struct uv__posix_spawn_fncs_tag { struct { int (*addchdir_np)(const posix_spawn_file_actions_t *, const char *); @@ -588,9 +590,11 @@ static int uv__spawn_set_posix_spawn_file_actions( } } +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 if (fd == use_fd) err = posix_spawn_file_actions_addinherit_np(actions, fd); else +#endif err = posix_spawn_file_actions_adddup2(actions, use_fd, fd); assert(err != ENOSYS); if (err != 0) @@ -839,7 +843,7 @@ static int uv__spawn_and_init_child( int exec_errorno; ssize_t r; -#if defined(__APPLE__) +#if defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050) uv_once(&posix_spawn_init_once, uv__spawn_init_posix_spawn); /* Special child process spawn case for macOS Big Sur (11.0) onwards diff --git a/src/libuv-1.44.2/src/unix/tty.c b/src/libuv-1.44.2/src/unix/tty.c index b4150525..0cb9a938 100644 --- a/src/libuv-1.44.2/src/unix/tty.c +++ b/src/libuv-1.44.2/src/unix/tty.c @@ -85,7 +85,7 @@ static int uv__tty_is_slave(const int fd) { int dummy; result = ioctl(fd, TIOCGPTN, &dummy) != 0; -#elif defined(__APPLE__) +#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 char dummy[256]; result = ioctl(fd, TIOCPTYGNAME, &dummy) != 0; diff --git a/src/libuv-1.44.2/src/unix/udp.c b/src/libuv-1.44.2/src/unix/udp.c index 4d985b88..ac847544 100644 --- a/src/libuv-1.44.2/src/unix/udp.c +++ b/src/libuv-1.44.2/src/unix/udp.c @@ -938,6 +938,7 @@ static int uv__udp_set_membership6(uv_udp_t* handle, !defined(__ANDROID__) && \ !defined(__DragonFly__) && \ !defined(__QNX__) && \ + (!defined(__APPLE__) || (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)) && \ !defined(__GNU__) static int uv__udp_set_source_membership4(uv_udp_t* handle, const struct sockaddr_in* multicast_addr, @@ -1131,6 +1132,7 @@ int uv_udp_set_source_membership(uv_udp_t* handle, !defined(__ANDROID__) && \ !defined(__DragonFly__) && \ !defined(__QNX__) && \ + (!defined(__APPLE__) || (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)) && \ !defined(__GNU__) int err; union uv__sockaddr mcast_addr;