Merge pull request #37 from thaJeztah/deprecate_termios

deprecate Termios in favor of unix.Termios
moby · Apr 30, 2023 · 0564e01 · 0564e01
2 parents 1849d9c + 80ddd80
commit 0564e01
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/tc.go b/tc.go
@@ -7,14 +7,14 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-func tcget(fd uintptr) (*Termios, error) {
+func tcget(fd uintptr) (*unix.Termios, error) {
 	p, err := unix.IoctlGetTermios(int(fd), getTermios)
 	if err != nil {
 		return nil, err
 	}
 	return p, nil
 }
 
-func tcset(fd uintptr, p *Termios) error {
+func tcset(fd uintptr, p *unix.Termios) error {
 	return unix.IoctlSetTermios(int(fd), setTermios, p)
 }
diff --git a/term.go b/term.go
@@ -18,7 +18,7 @@ var ErrInvalidState = errors.New("Invalid terminal state")
 
 // State represents the state of the terminal.
 type State struct {
-	termios Termios
+	termios unix.Termios
 }
 
 // Winsize represents the size of the terminal window.

diff --git a/termios.go b/termios.go
@@ -8,6 +8,8 @@ import (
 )
 
 // Termios is the Unix API for terminal I/O.
+//
+// Deprecated: use [unix.Termios].
 type Termios = unix.Termios
 
 // MakeRaw puts the terminal connected to the given file descriptor into raw
@@ -21,10 +23,10 @@ func MakeRaw(fd uintptr) (*State, error) {
 
 	oldState := State{termios: *termios}
 
-	termios.Iflag &^= (unix.IGNBRK | unix.BRKINT | unix.PARMRK | unix.ISTRIP | unix.INLCR | unix.IGNCR | unix.ICRNL | unix.IXON)
+	termios.Iflag &^= unix.IGNBRK | unix.BRKINT | unix.PARMRK | unix.ISTRIP | unix.INLCR | unix.IGNCR | unix.ICRNL | unix.IXON
 	termios.Oflag &^= unix.OPOST
-	termios.Lflag &^= (unix.ECHO | unix.ECHONL | unix.ICANON | unix.ISIG | unix.IEXTEN)
-	termios.Cflag &^= (unix.CSIZE | unix.PARENB)
+	termios.Lflag &^= unix.ECHO | unix.ECHONL | unix.ICANON | unix.ISIG | unix.IEXTEN
+	termios.Cflag &^= unix.CSIZE | unix.PARENB
 	termios.Cflag |= unix.CS8
 	termios.Cc[unix.VMIN] = 1
 	termios.Cc[unix.VTIME] = 0