TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-08-13 21:10:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1821 from michaelkoetter/fix-1795

Browse Source 
#1795 use unix.IoctlGetWinsize to get terminal size
This commit is contained in:
Alexander Neumann
2018-06-07 20:20:06 +02:00
parent cfc19b4582 d6fd94e49d
commit ab37c6095a
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/ui/termstatus/terminal_unix.go
View File

@@ -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
}