vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #429 from datawolf/io-set-termios-onlcr-for-master

Browse source 
Set -ONLCR on created consoles
This commit is contained in:
Kenfe-Mickaël Laventure 2017-01-17 14:07:50 -08:00 committed by GitHub
commit abc1bf4dea
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cmd/containerd-shim/console.go
View file

@ -16,6 +16,9 @@ func newConsole(uid, gid int) (*os.File, string, error) {
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} }
if err = saneTerminal(master); err != nil {
return nil, "", err
}
console, err := ptsname(master) console, err := ptsname(master)
if err != nil { if err != nil {
return nil, "", err return nil, "", err
@ -32,6 +35,29 @@ func newConsole(uid, gid int) (*os.File, string, error) {
return master, console, nil return master, console, nil
} }
// saneTerminal sets the necessary tty_ioctl(4)s to ensure that a pty pair
// created by us acts normally. In particular, a not-very-well-known default of
// Linux unix98 ptys is that they have +onlcr by default. While this isn't a
// problem for terminal emulators, because we relay data from the terminal we
// also relay that funky line discipline.
func saneTerminal(terminal *os.File) error {
// Go doesn't have a wrapper for any of the termios ioctls.
var termios syscall.Termios
if err := ioctl(terminal.Fd(), syscall.TCGETS, uintptr(unsafe.Pointer(&termios))); err != nil {
return fmt.Errorf("ioctl(tty, tcgets): %s", err.Error())
}
// Set -onlcr so we don't have to deal with \r.
termios.Oflag &^= syscall.ONLCR
if err := ioctl(terminal.Fd(), syscall.TCSETS, uintptr(unsafe.Pointer(&termios))); err != nil {
return fmt.Errorf("ioctl(tty, tcsets): %s", err.Error())
}
return nil
}
func ioctl(fd uintptr, flag, data uintptr) error { func ioctl(fd uintptr, flag, data uintptr) error {
if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, flag, data); err != 0 { if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, flag, data); err != 0 {
return err return err