Removed pty spawn to compile for windows. Broke the tty hack to another file to compile for windows

Author: dzervas

Gopkg.toml

@@ -17,7 +17,3 @@
 [[constraint]]
   branch = "master"
   name = "github.com/amoghe/distillog"
-
-[[constraint]]
-  name = "github.com/kr/pty"
-  version = "1.1.4"

inout/exec.go

@@ -1,15 +1,23 @@
 package inout
 
 import (
-	"os"
+	"io"
 	"os/exec"
 	"errors"
 	"strings"
-
-	"github.com/kr/pty"
 )
 
-func NewExecArgs(args []string) (*os.File, error) {
+type RWC struct {
+	io.Reader
+	io.Writer
+	io.Closer
+}
+
+func NewReadWriteCloser(r io.Reader, w io.Writer, c io.Closer) io.ReadWriteCloser {
+	return RWC{r, w, c}
+}
+
+func NewExecArgs(args []string) (*RWC, error) {
 	var c *exec.Cmd
 
 	if len(args) > 1 {
@@ -20,9 +28,14 @@ func NewExecArgs(args []string) (*os.File, error) {
 		return nil, errors.New("No command given")
 	}
 
-	return pty.Start(c)
+	// TODO: Run it in a TTY
+	// TODO: Combine Stderr
+	si, _ := c.StdinPipe()
+	so, _ := c.StdoutPipe()
+
+	return &RWC{so, si, nil}, c.Start()
 }
 
-func NewExec(cmd string) (*os.File, error) {
+func NewExec(cmd string) (*RWC, error) {
 	return NewExecArgs(strings.Split(cmd, " "))
 }

inout/tty.go

@@ -1,7 +1,6 @@
 package inout
 
 import (
-	"golang.org/x/sys/unix"
 	"github.com/mattn/go-tty"
 )
 
@@ -18,22 +17,6 @@ func NewTty() (*Tty, error) {
 	return tty, err
 }
 
-func (this *Tty) EnableRawTty() {
-	if this.reset == nil {
-		Log.Warningln("[!] Entering RAW mode (Ctrl-c will go to remote) - press Alt-r to go back to normal")
-		this.reset, _ = this.Raw()
-
-		// Very targeted fix for broken raw tty for non-tty output
-		// Numbers are taken from github.com/mattn/go-tty/tty_linux.go
-
-		// ioctlReadTermios
-		termios, _ := unix.IoctlGetTermios(int(this.Input().Fd()), 0x5401)
-		termios.Oflag |= unix.OPOST
-		// ioctlWriteTermios
-		unix.IoctlSetTermios(int(this.Input().Fd()), 0x5402, termios)
-	}
-}
-
 func (this *Tty) DisableRawTty() {
 	if this.reset != nil {
 		Log.Infoln("[i] Exiting RAW mode (Ctrl-c will kill the program)")

inout/tty_unix.go

@@ -0,0 +1,22 @@
+// +build !windows
+
+
+package inout
+
+import "golang.org/x/sys/unix"
+
+func (this *Tty) EnableRawTty() {
+	if this.reset == nil {
+		Log.Warningln("[!] Entering RAW mode (Ctrl-c will go to remote) - press Alt-r to go back to normal")
+		this.reset, _ = this.Raw()
+
+		// Very targeted fix for broken raw tty for non-tty output
+		// Numbers are taken from github.com/mattn/go-tty/tty_linux.go
+
+		// ioctlReadTermios
+		termios, _ := unix.IoctlGetTermios(int(this.Input().Fd()), 0x5401)
+		termios.Oflag |= unix.OPOST
+		// ioctlWriteTermios
+		unix.IoctlSetTermios(int(this.Input().Fd()), 0x5402, termios)
+	}
+}

inout/tty_windows.go

@@ -0,0 +1,11 @@
+// +build windows
+
+
+package inout
+
+func (this *Tty) EnableRawTty() {
+	if this.reset == nil {
+		Log.Warningln("[!] Entering RAW mode (Ctrl-c will go to remote) - press Alt-r to go back to normal")
+		this.reset, _ = this.Raw()
+	}
+}