cli/streams: (In|Out).SetRawTerminal: dry

Move the code to the commonStream type, which is where the actual
state field is kept.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

cli/streams/in.go

@@ -3,7 +3,6 @@ package streams
 import (
 	"errors"
 	"io"
-	"os"
 	"runtime"
 
 	"github.com/moby/term"
@@ -29,12 +28,8 @@ func (i *In) Close() error {
 // SetRawTerminal sets raw mode on the input terminal. It is a no-op if In
 // is not a TTY, or if the "NORAW" environment variable is set to a non-empty
 // value.
-func (i *In) SetRawTerminal() (err error) {
-	if !i.isTerminal || os.Getenv("NORAW") != "" {
-		return nil
-	}
-	i.state, err = term.SetRawTerminal(i.fd)
-	return err
+func (i *In) SetRawTerminal() error {
+	return i.setRawTerminal(term.SetRawTerminal)
 }
 
 // CheckTty checks if we are trying to attach to a container TTY

cli/streams/out.go

@@ -2,7 +2,6 @@ package streams
 
 import (
 	"io"
-	"os"
 
 	"github.com/moby/term"
 	"github.com/sirupsen/logrus"
@@ -26,12 +25,8 @@ func (o *Out) Write(p []byte) (int, error) {
 // On UNIX, this does nothing. On Windows, it disables LF -> CRLF/ translation.
 // It is a no-op if Out is not a TTY, or if the "NORAW" environment variable is
 // set to a non-empty value.
-func (o *Out) SetRawTerminal() (err error) {
-	if !o.isTerminal || os.Getenv("NORAW") != "" {
-		return nil
-	}
-	o.state, err = term.SetRawTerminalOutput(o.fd)
-	return err
+func (o *Out) SetRawTerminal() error {
+	return o.setRawTerminal(term.SetRawTerminalOutput)
 }
 
 // GetTtySize returns the height and width in characters of the TTY, or

cli/streams/stream.go

@@ -1,6 +1,8 @@
 package streams
 
 import (
+	"os"
+
 	"github.com/moby/term"
 )
 
@@ -20,13 +22,25 @@ func (s *commonStream) IsTerminal() bool {
 	return s.isTerminal
 }
 
-// RestoreTerminal restores normal mode to the terminal.
+// RestoreTerminal restores the terminal state if SetRawTerminal succeeded earlier.
 func (s *commonStream) RestoreTerminal() {
 	if s.state != nil {
 		_ = term.RestoreTerminal(s.fd, s.state)
 	}
 }
 
+func (s *commonStream) setRawTerminal(setter func(uintptr) (*term.State, error)) error {
+	if !s.isTerminal || os.Getenv("NORAW") != "" {
+		return nil
+	}
+	state, err := setter(s.fd)
+	if err != nil {
+		return err
+	}
+	s.state = state
+	return nil
+}
+
 // SetIsTerminal overrides whether a terminal is connected. It is used to
 // override this property in unit-tests, and should not be depended on for
 // other purposes.