From 589c23dc233c8dfafe07292662b50baff2b95161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20K=C3=B6tter?= Date: Sun, 27 May 2018 23:44:48 +0200 Subject: [PATCH] #1795 use unix.IoctlGetWinsize to get terminal size --- internal/ui/termstatus/terminal_unix.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/internal/ui/termstatus/terminal_unix.go b/internal/ui/termstatus/terminal_unix.go index c9f47f242..e49d62d40 100644 --- a/internal/ui/termstatus/terminal_unix.go +++ b/internal/ui/termstatus/terminal_unix.go @@ -4,8 +4,8 @@ package termstatus import ( "io" - "syscall" - "unsafe" + + "golang.org/x/sys/unix" isatty "github.com/mattn/go-isatty" ) @@ -30,10 +30,9 @@ func canUpdateStatus(fd uintptr) bool { // getTermSize returns the dimensions of the given terminal. // the code is taken from "golang.org/x/crypto/ssh/terminal" func getTermSize(fd uintptr) (width, height int, err error) { - var dimensions [4]uint16 - - if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, fd, uintptr(syscall.TIOCGWINSZ), uintptr(unsafe.Pointer(&dimensions)), 0, 0, 0); err != 0 { + ws, err := unix.IoctlGetWinsize(int(fd), unix.TIOCGWINSZ) + if err != nil { return -1, -1, err } - return int(dimensions[1]), int(dimensions[0]), nil + return int(ws.Col), int(ws.Row), nil }