Skip to content

Commit

Permalink
Fix termcaps on the linux client
Browse files Browse the repository at this point in the history
  • Loading branch information
creack committed Mar 26, 2013
1 parent e4a69b1 commit 50bee2f
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 18 deletions.
3 changes: 3 additions & 0 deletions container.go
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@ func (container *Container) Start() error {

var err error
if container.Config.Tty {
container.cmd.Env = append(container.Config.Env,
"TERM="+os.Getenv("TERM"),
)
err = container.startPty()
} else {
err = container.start()
Expand Down
66 changes: 48 additions & 18 deletions term/termios_linux.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,31 @@
package term

import (
"syscall"
"unsafe"
"os"
"syscall"
"unsafe"
)

// #include <termios.h>
// #include <sys/ioctl.h>
/*
void MakeRaw() {
struct termios t;
// FIXME: Handle errors?
ioctl(0, TCGETS, &t);
t.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON);
t.c_oflag &= ~OPOST;
t.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
t.c_cflag &= ~(CSIZE | PARENB);
t.c_cflag |= CS8;
ioctl(0, TCSETS, &t);
}
*/
import "C"

const (
getTermios = syscall.TCGETS
setTermios = syscall.TCSETS
Expand All @@ -14,19 +35,28 @@ const (
// mode and returns the previous state of the terminal so that it can be
// restored.
func MakeRaw(fd int) (*State, error) {
var oldState State
if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(getTermios), uintptr(unsafe.Pointer(&oldState.termios)), 0, 0, 0); err != 0 {
return nil, err
}

newState := oldState.termios
newState.Iflag &^= ISTRIP | IXON | IXOFF
newState.Iflag |= ICRNL
newState.Oflag |= ONLCR
newState.Lflag &^= ECHO | ICANON | ISIG
if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(setTermios), uintptr(unsafe.Pointer(&newState)), 0, 0, 0); err != 0 {
return nil, err
}

return &oldState, nil
}

fd = int(os.Stdin.Fd())

var oldState State
if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), syscall.TCGETS, uintptr(unsafe.Pointer(&oldState.termios)), 0, 0, 0); err != 0 {
return nil, err
}
C.MakeRaw()
return &oldState, nil

// FIXME: post on goland issues this: very same as the C function bug non-working

// newState := oldState.termios

// newState.Iflag &^= (IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON)
// newState.Oflag &^= OPOST
// newState.Lflag &^= (ECHO | syscall.ECHONL | ICANON | ISIG | IEXTEN)
// newState.Cflag &^= (CSIZE | syscall.PARENB)
// newState.Cflag |= CS8

// if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, uintptr(fd), syscall.TCSETS, uintptr(unsafe.Pointer(&newState))); err != 0 {
// return nil, err
// }
// return &oldState, nil
}

0 comments on commit 50bee2f

Please sign in to comment.