From 5fe1803489e079d826475a8b74b0640849b3b141 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Thu, 15 Nov 2018 08:42:08 +0100 Subject: [PATCH] Update vendor/github.com/containerd/console Fixes: #410 The console package in vendor contains a big endian bug. The issue has already been solved in runc. See PRs: - https://github.com/opencontainers/runc/pull/1727 - https://github.com/containerd/console/pull/20 The console version has been updated from commit 84eeaae905 to commit 2748ece166 (commit that fixed the big-endian issue) The console package has been added in the Gopkg.toml because the console package is not directly used in the code and the dep command doesn't automatically update the console package. Signed-off-by: Alice Frosi --- Gopkg.toml | 4 ++++ .../github.com/containerd/console/tc_linux.go | 18 +++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Gopkg.toml b/Gopkg.toml index 2a8b05567c..02e3c5316c 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -42,6 +42,10 @@ name = "google.golang.org/grpc" revision = "d11072e7ca9811b1100b80ca0269ac831f06d024" +[[override]] + name = "github.com/containerd/console" + revision = "2748ece16665b45a47f884001d5831ec79703880" + [prune] non-go = true go-tests = true diff --git a/vendor/github.com/containerd/console/tc_linux.go b/vendor/github.com/containerd/console/tc_linux.go index 80ef2f6fb3..73330eb71f 100644 --- a/vendor/github.com/containerd/console/tc_linux.go +++ b/vendor/github.com/containerd/console/tc_linux.go @@ -13,25 +13,21 @@ const ( cmdTcSet = unix.TCSETS ) -func ioctl(fd, flag, data uintptr) error { - if _, _, err := unix.Syscall(unix.SYS_IOCTL, fd, flag, data); err != 0 { - return err - } - return nil -} - // unlockpt unlocks the slave pseudoterminal device corresponding to the master pseudoterminal referred to by f. // unlockpt should be called before opening the slave side of a pty. func unlockpt(f *os.File) error { var u int32 - return ioctl(f.Fd(), unix.TIOCSPTLCK, uintptr(unsafe.Pointer(&u))) + if _, _, err := unix.Syscall(unix.SYS_IOCTL, f.Fd(), unix.TIOCSPTLCK, uintptr(unsafe.Pointer(&u))); err != 0 { + return err + } + return nil } // ptsname retrieves the name of the first available pts for the given master. func ptsname(f *os.File) (string, error) { - n, err := unix.IoctlGetInt(int(f.Fd()), unix.TIOCGPTN) - if err != nil { + var u uint32 + if _, _, err := unix.Syscall(unix.SYS_IOCTL, f.Fd(), unix.TIOCGPTN, uintptr(unsafe.Pointer(&u))); err != 0 { return "", err } - return fmt.Sprintf("/dev/pts/%d", n), nil + return fmt.Sprintf("/dev/pts/%d", u), nil }