8b5cc2e1dc
full diff: https://github.com/containerd/consolve/compare/v1.0.0...v1.0.1
vendor golang.org/x/sys 2334cc1a136f0a5b4384f1a27e3634457be08553
full diff: ed371f2e16...2334cc1a13
- unix: add Darwin support for clonefile syscalls
- Adds openat2 for linux
openat2 is a new syscall added to Linux 5.6. It provides a superset of
openat(2) functionality, extending it with flags telling the kernel how
to resolve the paths.
For more info, see https://lwn.net/Articles/803237/
NOTE that this is a second attempt to add the call; the previous one
(https://golang.org/cl/227280) was reverted
(https://golang.org/cl/227846) due to the test case failure on ARM
(https://golang.org/issue/38357).
This CL has the test case reworked to be less assumptive to the testing
environment. In particular, it first tries if the most simplistic
openat2() call succeeds, and skips the test otherwise. It is done that
way because CI can be under under different kernels and in various
envrionments -- in particular, Docker+seccomp can result in EPERM from a
system call (which is not expected otherwise).
For previous discussions about the test case, see
https://golang.org/cl/227865.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
92 lines
2.2 KiB
Go
92 lines
2.2 KiB
Go
// +build darwin freebsd linux netbsd openbsd solaris
|
|
|
|
/*
|
|
Copyright The containerd Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package console
|
|
|
|
import (
|
|
"golang.org/x/sys/unix"
|
|
)
|
|
|
|
func tcget(fd uintptr, p *unix.Termios) error {
|
|
termios, err := unix.IoctlGetTermios(int(fd), cmdTcGet)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
*p = *termios
|
|
return nil
|
|
}
|
|
|
|
func tcset(fd uintptr, p *unix.Termios) error {
|
|
return unix.IoctlSetTermios(int(fd), cmdTcSet, p)
|
|
}
|
|
|
|
func tcgwinsz(fd uintptr) (WinSize, error) {
|
|
var ws WinSize
|
|
|
|
uws, err := unix.IoctlGetWinsize(int(fd), unix.TIOCGWINSZ)
|
|
if err != nil {
|
|
return ws, err
|
|
}
|
|
|
|
// Translate from unix.Winsize to console.WinSize
|
|
ws.Height = uws.Row
|
|
ws.Width = uws.Col
|
|
ws.x = uws.Xpixel
|
|
ws.y = uws.Ypixel
|
|
return ws, nil
|
|
}
|
|
|
|
func tcswinsz(fd uintptr, ws WinSize) error {
|
|
// Translate from console.WinSize to unix.Winsize
|
|
|
|
var uws unix.Winsize
|
|
uws.Row = ws.Height
|
|
uws.Col = ws.Width
|
|
uws.Xpixel = ws.x
|
|
uws.Ypixel = ws.y
|
|
|
|
return unix.IoctlSetWinsize(int(fd), unix.TIOCSWINSZ, &uws)
|
|
}
|
|
|
|
func setONLCR(fd uintptr, enable bool) error {
|
|
var termios unix.Termios
|
|
if err := tcget(fd, &termios); err != nil {
|
|
return err
|
|
}
|
|
if enable {
|
|
// Set +onlcr so we can act like a real terminal
|
|
termios.Oflag |= unix.ONLCR
|
|
} else {
|
|
// Set -onlcr so we don't have to deal with \r.
|
|
termios.Oflag &^= unix.ONLCR
|
|
}
|
|
return tcset(fd, &termios)
|
|
}
|
|
|
|
func cfmakeraw(t unix.Termios) unix.Termios {
|
|
t.Iflag &^= (unix.IGNBRK | unix.BRKINT | unix.PARMRK | unix.ISTRIP | unix.INLCR | unix.IGNCR | unix.ICRNL | unix.IXON)
|
|
t.Oflag &^= unix.OPOST
|
|
t.Lflag &^= (unix.ECHO | unix.ECHONL | unix.ICANON | unix.ISIG | unix.IEXTEN)
|
|
t.Cflag &^= (unix.CSIZE | unix.PARENB)
|
|
t.Cflag &^= unix.CS8
|
|
t.Cc[unix.VMIN] = 1
|
|
t.Cc[unix.VTIME] = 0
|
|
|
|
return t
|
|
}
|