mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-07-04 03:11:43 +00:00
[wpinet] Upgrade to libuv 1.46.0 (#5446)
This commit is contained in:
@@ -0,0 +1,61 @@
|
||||
From 0000000000000000000000000000000000000000 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 05/10] Cleanup problematic language
|
||||
|
||||
---
|
||||
src/unix/tty.c | 21 +++++++++++----------
|
||||
1 file changed, 11 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/unix/tty.c b/src/unix/tty.c
|
||||
index d099bdb3b677212d21e06ac7bb1031c8e5386499..1bd217b5a15eed13a8349c479b53471dd36ca216 100644
|
||||
--- a/src/unix/tty.c
|
||||
+++ b/src/unix/tty.c
|
||||
@@ -79,7 +79,7 @@ int uv__tcsetattr(int fd, int how, const struct termios *term) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static int uv__tty_is_slave(const int fd) {
|
||||
+static int uv__tty_is_peripheral(const int fd) {
|
||||
int result;
|
||||
#if defined(__linux__) || defined(__FreeBSD__)
|
||||
int dummy;
|
||||
@@ -91,15 +91,16 @@ static int uv__tty_is_slave(const int fd) {
|
||||
result = ioctl(fd, TIOCPTYGNAME, &dummy) != 0;
|
||||
#elif defined(__NetBSD__)
|
||||
/*
|
||||
- * NetBSD as an extension returns with ptsname(3) and ptsname_r(3) the slave
|
||||
- * device name for both descriptors, the master one and slave one.
|
||||
+ * NetBSD as an extension returns with ptsname(3) and ptsname_r(3) the
|
||||
+ * peripheral device name for both descriptors, the controller one and
|
||||
+ * peripheral one.
|
||||
*
|
||||
* Implement function to compare major device number with pts devices.
|
||||
*
|
||||
* The major numbers are machine-dependent, on NetBSD/amd64 they are
|
||||
* respectively:
|
||||
- * - master tty: ptc - major 6
|
||||
- * - slave tty: pts - major 5
|
||||
+ * - controller tty: ptc - major 6
|
||||
+ * - peripheral tty: pts - major 5
|
||||
*/
|
||||
|
||||
struct stat sb;
|
||||
@@ -174,12 +175,12 @@ int uv_tty_init(uv_loop_t* loop, uv_tty_t* tty, int fd, int unused) {
|
||||
* other processes.
|
||||
*/
|
||||
if (type == UV_TTY) {
|
||||
- /* Reopening a pty in master mode won't work either because the reopened
|
||||
- * pty will be in slave mode (*BSD) or reopening will allocate a new
|
||||
- * master/slave pair (Linux). Therefore check if the fd points to a
|
||||
- * slave device.
|
||||
+ /* Reopening a pty in controller mode won't work either because the reopened
|
||||
+ * pty will be in peripheral mode (*BSD) or reopening will allocate a new
|
||||
+ * controller/peripheral pair (Linux). Therefore check if the fd points to a
|
||||
+ * peripheral device.
|
||||
*/
|
||||
- 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 | O_NOCTTY);
|
||||
else
|
||||
r = -1;
|
||||
Reference in New Issue
Block a user