Fix #194, give raw terminal ability to skip capturing overflow in cases where it doesnt have overflow

Author: NHAS

internal/server/commands/access.go

@@ -73,12 +73,12 @@ func (s *access) Run(user *users.User, tty io.ReadWriter, line terminal.ParsedLi
 		_, err := tty.Read(b)
 		if err != nil {
 			if term, ok := tty.(*terminal.Terminal); ok {
-				term.DisableRaw()
+				term.DisableRaw(false)
 			}
 			return err
 		}
 		if term, ok := tty.(*terminal.Terminal); ok {
-			term.DisableRaw()
+			term.DisableRaw(false)
 		}
 
 		if !(b[0] == 'y' || b[0] == 'Y') {
@@ -96,7 +96,7 @@ func (s *access) Run(user *users.User, tty io.ReadWriter, line terminal.ParsedLi
 		changes++
 	}
 
-	return fmt.Errorf("%d client owners modified", changes)
+	return fmt.Errorf("\n%d client owners modified", changes)
 }
 
 func (s *access) ValidArgs() map[string]string {

internal/server/commands/connect.go

@@ -73,7 +73,7 @@ func (c *connect) Run(user *users.User, tty io.ReadWriter, line terminal.ParsedL
 
 	defer func() {
 		c.log.Info("Disconnected from remote host %s (%s)", target.RemoteAddr(), target.ClientVersion())
-		term.DisableRaw()
+		term.DisableRaw(true)
 	}()
 
 	//Attempt to connect to remote host and send inital pty request and screen size

internal/server/commands/exec.go

@@ -58,12 +58,12 @@ func (e *exec) Run(user *users.User, tty io.ReadWriter, line terminal.ParsedLine
 			_, err := tty.Read(b)
 			if err != nil {
 				if term, ok := tty.(*terminal.Terminal); ok {
-					term.DisableRaw()
+					term.DisableRaw(false)
 				}
 				return err
 			}
 			if term, ok := tty.(*terminal.Terminal); ok {
-				term.DisableRaw()
+				term.DisableRaw(false)
 			}
 
 			if !(b[0] == 'y' || b[0] == 'Y') {

internal/server/commands/kill.go

@@ -46,12 +46,12 @@ func (k *kill) Run(user *users.User, tty io.ReadWriter, line terminal.ParsedLine
 		_, err := tty.Read(b)
 		if err != nil {
 			if term, ok := tty.(*terminal.Terminal); ok {
-				term.DisableRaw()
+				term.DisableRaw(false)
 			}
 			return err
 		}
 		if term, ok := tty.(*terminal.Terminal); ok {
-			term.DisableRaw()
+			term.DisableRaw(false)
 		}
 
 		if !(b[0] == 'y' || b[0] == 'Y') {

internal/server/commands/log.go

@@ -89,7 +89,7 @@ func (l *logCommand) Run(user *users.User, tty io.ReadWriter, line terminal.Pars
 		}
 
 		if isTerm {
-			term.DisableRaw()
+			term.DisableRaw(false)
 		}
 
 	} else if line.IsSet("to-file") {

internal/server/commands/watch.go

@@ -154,7 +154,7 @@ func (w *watch) Run(user *users.User, tty io.ReadWriter, line terminal.ParsedLin
 	}
 
 	if isTerm {
-		term.DisableRaw()
+		term.DisableRaw(false)
 	}
 
 	return nil

internal/terminal/terminal.go

@@ -138,12 +138,14 @@ func (t *Terminal) EnableRaw() {
 	}
 }
 
-func (t *Terminal) DisableRaw() {
+func (t *Terminal) DisableRaw(captureOverflow bool) {
 	t.lock.Lock()
 	defer t.lock.Unlock()
 
 	if t.raw {
-		t.rawOverflow = make(chan []byte, 1)
+		if captureOverflow {
+			t.rawOverflow = make(chan []byte, 1)
+		}
 
 		t.raw = false