@@ -11,7 +11,7 @@ import (

 import "C"

 // Termios is the Unix API for terminal I/O.

-// It is passthgrouh for syscall.Termios in order to make it portable with

+// It is passthrough for syscall.Termios in order to make it portable with

 // other platforms where it is not available or handled differently.

 type Termios syscall.Termios

@@ -1,5 +1,6 @@

 // +build !windows

 // +build !linux !cgo

+// +build !solaris !cgo

 package term

new file mode 100644

@@ -0,0 +1,63 @@

+// +build solaris,cgo

+

+package term

+

+import (

+	"syscall"

+	"unsafe"

+)

+

+// #include <termios.h>

+import "C"

+

+// Termios is the Unix API for terminal I/O.

+// It is passthrough for syscall.Termios in order to make it portable with

+// other platforms where it is not available or handled differently.

+type Termios syscall.Termios

+

+// MakeRaw put the terminal connected to the given file descriptor into raw

+// mode and returns the previous state of the terminal so that it can be

+// restored.

+func MakeRaw(fd uintptr) (*State, error) {

+	var oldState State

+	if err := tcget(fd, &oldState.termios); err != 0 {

+		return nil, err

+	}

+

+	newState := oldState.termios

+

+	newState.Iflag &^= (syscall.IGNBRK | syscall.BRKINT | syscall.PARMRK | syscall.ISTRIP | syscall.INLCR | syscall.IGNCR | syscall.ICRNL | syscall.IXON | syscall.IXANY)

+	newState.Oflag &^= syscall.OPOST

+	newState.Lflag &^= (syscall.ECHO | syscall.ECHONL | syscall.ICANON | syscall.ISIG | syscall.IEXTEN)

+	newState.Cflag &^= (syscall.CSIZE | syscall.PARENB)

+	newState.Cflag |= syscall.CS8

+

+	/*

+		VMIN is the minimum number of characters that needs to be read in non-canonical mode for it to be returned

+		Since VMIN is overloaded with another element in canonical mode when we switch modes it defaults to 4. It

+		needs to be explicitly set to 1.

+	*/

+	newState.Cc[C.VMIN] = 1

+	newState.Cc[C.VTIME] = 0

+

+	if err := tcset(fd, &newState); err != 0 {

+		return nil, err

+	}

+	return &oldState, nil

+}

+

+func tcget(fd uintptr, p *Termios) syscall.Errno {

+	ret, err := C.tcgetattr(C.int(fd), (*C.struct_termios)(unsafe.Pointer(p)))

+	if ret != 0 {

+		return err.(syscall.Errno)

+	}

+	return 0

+}

+

+func tcset(fd uintptr, p *Termios) syscall.Errno {

+	ret, err := C.tcsetattr(C.int(fd), C.TCSANOW, (*C.struct_termios)(unsafe.Pointer(p)))

+	if ret != 0 {

+		return err.(syscall.Errno)

+	}

+	return 0

+}

@@ -10,7 +10,6 @@ import (

 	"os"

 	"os/signal"

 	"syscall"

-	"unsafe"

 )

 var (

@@ -47,27 +46,6 @@ func GetFdInfo(in interface{}) (uintptr, bool) {

 	return inFd, isTerminalIn

 }

-// GetWinsize returns the window size based on the specified file descriptor.

-func GetWinsize(fd uintptr) (*Winsize, error) {

-	ws := &Winsize{}

-	_, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(syscall.TIOCGWINSZ), uintptr(unsafe.Pointer(ws)))

-	// Skip errno = 0

-	if err == 0 {

-		return ws, nil

-	}

-	return ws, err

-}

-

-// SetWinsize tries to set the specified window size for the specified file descriptor.

-func SetWinsize(fd uintptr, ws *Winsize) error {

-	_, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(syscall.TIOCSWINSZ), uintptr(unsafe.Pointer(ws)))

-	// Skip errno = 0

-	if err == 0 {

-		return nil

-	}

-	return err

-}

-

 // IsTerminal returns true if the given file descriptor is a terminal.

 func IsTerminal(fd uintptr) bool {

 	var termios Termios

new file mode 100644

@@ -0,0 +1,41 @@

+// +build solaris

+

+package term

+

+import (

+	"syscall"

+	"unsafe"

+)

+

+/*

+#include <unistd.h>

+#include <stropts.h>

+#include <termios.h>

+

+// Small wrapper to get rid of variadic args of ioctl()

+int my_ioctl(int fd, int cmd, struct winsize *ws) {

+	return ioctl(fd, cmd, ws);

+}

+*/

+import "C"

+

+// GetWinsize returns the window size based on the specified file descriptor.

+func GetWinsize(fd uintptr) (*Winsize, error) {

+	ws := &Winsize{}

+	ret, err := C.my_ioctl(C.int(fd), C.int(syscall.TIOCGWINSZ), (*C.struct_winsize)(unsafe.Pointer(ws)))

+	// Skip retval = 0

+	if ret == 0 {

+		return ws, nil

+	}

+	return ws, err

+}

+

+// SetWinsize tries to set the specified window size for the specified file descriptor.

+func SetWinsize(fd uintptr, ws *Winsize) error {

+	ret, err := C.my_ioctl(C.int(fd), C.int(syscall.TIOCSWINSZ), (*C.struct_winsize)(unsafe.Pointer(ws)))

+	// Skip retval = 0

+	if ret == 0 {

+		return nil

+	}

+	return err

+}

new file mode 100644

@@ -0,0 +1,29 @@

+// +build !solaris,!windows

+

+package term

+

+import (

+	"syscall"

+	"unsafe"

+)

+

+// GetWinsize returns the window size based on the specified file descriptor.

+func GetWinsize(fd uintptr) (*Winsize, error) {

+	ws := &Winsize{}

+	_, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(syscall.TIOCGWINSZ), uintptr(unsafe.Pointer(ws)))

+	// Skipp errno = 0

+	if err == 0 {

+		return ws, nil

+	}

+	return ws, err

+}

+

+// SetWinsize tries to set the specified window size for the specified file descriptor.

+func SetWinsize(fd uintptr, ws *Winsize) error {

+	_, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(syscall.TIOCSWINSZ), uintptr(unsafe.Pointer(ws)))

+	// Skipp errno = 0

+	if err == 0 {

+		return nil

+	}

+	return err

+}