Merge pull request #19 from joeycumines/upstream-elk-language-pr-2

Fix restoring terminal - pass down and use fd
elk-language · May 9, 2024 · 32b5449 · 32b5449
2 parents 7d668ee + 47d2842
commit 32b5449
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/reader_posix.go b/reader_posix.go
@@ -37,7 +37,7 @@ func (t *PosixReader) Open() error {
 
 // Close should be called after stopping input
 func (t *PosixReader) Close() error {
- if err := term.Restore(); err != nil {
+ if err := term.RestoreFD(t.fd); err != nil {
  _ = syscall.Close(t.fd)
  return err
  }

diff --git a/term/term.go b/term/term.go
@@ -37,9 +37,14 @@ func getOriginalTermios(fd int) (*unix.Termios, error) {
 
 // Restore terminal's mode.
 func Restore() error {
- o, err := getOriginalTermios(saveTermiosFD)
+ return RestoreFD(saveTermiosFD)
+}
+
+// RestoreFD restores terminal's mode for the given file descriptor.
+func RestoreFD(fd int) error {
+ o, err := getOriginalTermios(fd)
  if err != nil {
  return err
  }
- return termios.Tcsetattr(uintptr(saveTermiosFD), termios.TCSANOW, o)
+ return termios.Tcsetattr(uintptr(fd), termios.TCSANOW, o)
 }