The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/7826
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
From 4a25da23b978d2eacb145d710a9682cc12b74f88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Fri, 28 Aug 2020 11:24:29 -0400
Subject: [PATCH] shared/log15: Fix due to recent unix change
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
shared/log15/term/terminal_notwindows.go | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/shared/log15/term/terminal_notwindows.go
b/shared/log15/term/terminal_notwindows.go
index 56f6992a07..55ad733187 100644
--- a/shared/log15/term/terminal_notwindows.go
+++ b/shared/log15/term/terminal_notwindows.go
@@ -8,14 +8,11 @@
package term
import (
- "unsafe"
-
"golang.org/x/sys/unix"
)
// IsTty returns true if the given file descriptor is a terminal.
func IsTty(fd uintptr) bool {
- var termios Termios
- _, _, err := unix.Syscall6(unix.SYS_IOCTL, fd, ioctlReadTermios,
uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
- return err == 0
+ _, err := unix.IoctlGetTermios(int(fd), ioctlReadTermios)
+ return err == nil
}
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
