mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-07-04 03:11:43 +00:00
[wpinet] Update to libuv 1.44.1 (#4232)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From ea00b73593e7146c01df4320e3e2e345665fd1c3 Mon Sep 17 00:00:00 2001
|
||||
From 644521f5d44152e0196cb630864d37ba79c8a39e Mon Sep 17 00:00:00 2001
|
||||
From: PJ Reiniger <pj.reiniger@gmail.com>
|
||||
Date: Tue, 26 Apr 2022 15:24:47 -0400
|
||||
Subject: [PATCH 4/7] Cleanup problematic language
|
||||
@@ -8,10 +8,10 @@ Subject: [PATCH 4/7] Cleanup problematic language
|
||||
1 file changed, 11 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/unix/tty.c b/src/unix/tty.c
|
||||
index 74d3d75d..5f681406 100644
|
||||
index 9442cf16..89766884 100644
|
||||
--- a/src/unix/tty.c
|
||||
+++ b/src/unix/tty.c
|
||||
@@ -38,7 +38,7 @@ static int orig_termios_fd = -1;
|
||||
@@ -66,7 +66,7 @@ static int orig_termios_fd = -1;
|
||||
static struct termios orig_termios;
|
||||
static uv_spinlock_t termios_spinlock = UV_SPINLOCK_INITIALIZER;
|
||||
|
||||
@@ -20,7 +20,7 @@ index 74d3d75d..5f681406 100644
|
||||
int result;
|
||||
#if defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
||||
int dummy;
|
||||
@@ -50,15 +50,16 @@ static int uv__tty_is_slave(const int fd) {
|
||||
@@ -78,15 +78,16 @@ static int uv__tty_is_slave(const int fd) {
|
||||
result = ioctl(fd, TIOCPTYGNAME, &dummy) != 0;
|
||||
#elif defined(__NetBSD__)
|
||||
/*
|
||||
@@ -41,7 +41,7 @@ index 74d3d75d..5f681406 100644
|
||||
*/
|
||||
|
||||
struct stat sb;
|
||||
@@ -133,12 +134,12 @@ int uv_tty_init(uv_loop_t* loop, uv_tty_t* tty, int fd, int unused) {
|
||||
@@ -161,12 +162,12 @@ int uv_tty_init(uv_loop_t* loop, uv_tty_t* tty, int fd, int unused) {
|
||||
* other processes.
|
||||
*/
|
||||
if (type == UV_TTY) {
|
||||
@@ -56,7 +56,7 @@ index 74d3d75d..5f681406 100644
|
||||
*/
|
||||
- if (uv__tty_is_slave(fd) && ttyname_r(fd, path, sizeof(path)) == 0)
|
||||
+ if (uv__tty_is_peripheral(fd) && ttyname_r(fd, path, sizeof(path)) == 0)
|
||||
r = uv__open_cloexec(path, mode);
|
||||
r = uv__open_cloexec(path, mode | O_NOCTTY);
|
||||
else
|
||||
r = -1;
|
||||
--
|
||||
|
||||
Reference in New Issue
Block a user