Fix c-bata#266 correctly restore terminal parameters

joeycumines · Aug 10, 2023 · 5473460 · 5473460
1 parent 6343189
commit 5473460
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/input_posix.go b/input_posix.go
@@ -14,8 +14,7 @@ const maxReadBytes = 1024
 
 // PosixParser is a ConsoleParser implementation for POSIX environment.
 type PosixParser struct {
-	fd          int
-	origTermios syscall.Termios
+	fd int
 }
 
 // Setup should be called before starting input

diff --git a/internal/term/term.go b/internal/term/term.go
@@ -11,7 +11,7 @@ import (
 )
 
 var (
-	saveTermios     *unix.Termios
+	saveTermios     unix.Termios
 	saveTermiosErr  error
 	saveTermiosFD   int
 	saveTermiosOnce sync.Once
@@ -20,9 +20,19 @@ var (
 func getOriginalTermios(fd int) (*unix.Termios, error) {
 	saveTermiosOnce.Do(func() {
 		saveTermiosFD = fd
-		saveTermios, saveTermiosErr = termios.Tcgetattr(uintptr(fd))
+		var v *unix.Termios
+		v, saveTermiosErr = termios.Tcgetattr(uintptr(fd))
+		if saveTermiosErr == nil {
+			// save a copy
+			saveTermios = *v
+		}
 	})
-	return saveTermios, saveTermiosErr
+	if saveTermiosErr != nil {
+		return nil, saveTermiosErr
+	}
+	// return a copy
+	v := saveTermios
+	return &v, nil
 }
 
 // Restore terminal's mode.