From e1c53e35c24489ac08bbc4dcda8cacced8180912 Mon Sep 17 00:00:00 2001
From: dmitryk-dk <kozlovdmitriyy@gmail.com>
Date: Sun, 8 May 2022 12:44:33 +0300
Subject: [PATCH 1/5] Update dependencies, use term instead of Syscall

---
 v3/go.mod                     |  8 ++++++--
 v3/go.sum                     |  6 ++++--
 v3/termutil/term_appengine.go |  2 +-
 v3/termutil/term_bsd.go       |  3 +--
 v3/termutil/term_linux.go     |  3 +--
 v3/termutil/term_nix.go       |  3 +--
 v3/termutil/term_solaris.go   |  3 +--
 v3/termutil/term_win.go       |  2 +-
 v3/termutil/term_x.go         | 34 +++++++++++++---------------------
 9 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/v3/go.mod b/v3/go.mod
index ec2b67b..4d47460 100644
--- a/v3/go.mod
+++ b/v3/go.mod
@@ -6,8 +6,12 @@ require (
 	github.com/mattn/go-colorable v0.1.8
 	github.com/mattn/go-isatty v0.0.12
 	github.com/mattn/go-runewidth v0.0.12
+	golang.org/x/term v0.0.0-20220411215600-e5f449aeb171
+)
+
+require (
 	github.com/rivo/uniseg v0.2.0 // indirect
-	golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 // indirect
+	golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
 )
 
-go 1.12
+go 1.18
diff --git a/v3/go.sum b/v3/go.sum
index 70a1b2b..4d5f9e0 100644
--- a/v3/go.sum
+++ b/v3/go.sum
@@ -13,5 +13,7 @@ github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 h1:F5Gozwx4I1xtr/sr/8CFbb57iKi3297KFs0QDbGN60A=
-golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 h1:nonptSpoQ4vQjyraW20DXPAglgQfVnM9ZC6MmNLMR60=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 h1:EH1Deb8WZJ0xc0WK//leUHXcX9aLE5SymusoTmMZye8=
+golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
diff --git a/v3/termutil/term_appengine.go b/v3/termutil/term_appengine.go
index 4b7b20e..765ff2b 100644
--- a/v3/termutil/term_appengine.go
+++ b/v3/termutil/term_appengine.go
@@ -1,4 +1,4 @@
-// +build appengine
+//go:build appengine
 
 package termutil
 
diff --git a/v3/termutil/term_bsd.go b/v3/termutil/term_bsd.go
index 272659a..d29404a 100644
--- a/v3/termutil/term_bsd.go
+++ b/v3/termutil/term_bsd.go
@@ -1,5 +1,4 @@
-// +build darwin freebsd netbsd openbsd dragonfly
-// +build !appengine
+//go:build (darwin || freebsd || netbsd || openbsd || dragonfly) && !appengine
 
 package termutil
 
diff --git a/v3/termutil/term_linux.go b/v3/termutil/term_linux.go
index 2f59e53..bec62af 100644
--- a/v3/termutil/term_linux.go
+++ b/v3/termutil/term_linux.go
@@ -1,5 +1,4 @@
-// +build linux
-// +build !appengine
+//go:build linux && !appengine
 
 package termutil
 
diff --git a/v3/termutil/term_nix.go b/v3/termutil/term_nix.go
index 14277e7..4513e37 100644
--- a/v3/termutil/term_nix.go
+++ b/v3/termutil/term_nix.go
@@ -1,5 +1,4 @@
-// +build linux darwin freebsd netbsd openbsd dragonfly
-// +build !appengine
+//go:build (linux || darwin || freebsd || netbsd || openbsd || dragonfly) && !appengine
 
 package termutil
 
diff --git a/v3/termutil/term_solaris.go b/v3/termutil/term_solaris.go
index fc96c2b..02cfabf 100644
--- a/v3/termutil/term_solaris.go
+++ b/v3/termutil/term_solaris.go
@@ -1,5 +1,4 @@
-// +build solaris
-// +build !appengine
+//go:build solaris && !appengine
 
 package termutil
 
diff --git a/v3/termutil/term_win.go b/v3/termutil/term_win.go
index 3150dfd..1ccf131 100644
--- a/v3/termutil/term_win.go
+++ b/v3/termutil/term_win.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package termutil
 
diff --git a/v3/termutil/term_x.go b/v3/termutil/term_x.go
index 1674d3e..2484fa0 100644
--- a/v3/termutil/term_x.go
+++ b/v3/termutil/term_x.go
@@ -1,5 +1,4 @@
-// +build linux darwin freebsd netbsd openbsd solaris dragonfly
-// +build !appengine
+//go:build (linux || darwin || freebsd || netbsd || openbsd || solaris || dragonfly) && !appengine
 
 package termutil
 
@@ -8,6 +7,8 @@ import (
 	"os"
 	"syscall"
 	"unsafe"
+
+	"golang.org/x/term"
 )
 
 var (
@@ -16,6 +17,7 @@ var (
 	unlockSignals = []os.Signal{
 		os.Interrupt, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGKILL,
 	}
+	termState *term.State
 )
 
 type window struct {
@@ -53,30 +55,20 @@ func TerminalSize() (rows, cols int, err error) {
 	return int(w.Row), int(w.Col), nil
 }
 
-var oldState syscall.Termios
-
-func lockEcho() (err error) {
+func lockEcho() error {
 	fd := tty.Fd()
-	if _, _, e := syscall.Syscall6(sysIoctl, fd, ioctlReadTermios, uintptr(unsafe.Pointer(&oldState)), 0, 0, 0); e != 0 {
-		err = fmt.Errorf("Can't get terminal settings: %v", e)
-		return
-	}
 
-	newState := oldState
-	newState.Lflag &^= syscall.ECHO
-	newState.Lflag |= syscall.ICANON | syscall.ISIG
-	newState.Iflag |= syscall.ICRNL
-	if _, _, e := syscall.Syscall6(sysIoctl, fd, ioctlWriteTermios, uintptr(unsafe.Pointer(&newState)), 0, 0, 0); e != 0 {
-		err = fmt.Errorf("Can't set terminal settings: %v", e)
-		return
+	var err error
+	if termState, err = term.MakeRaw(int(fd)); err != nil {
+		return fmt.Errorf("error when puts the terminal connected to the given file descriptor: %v", err)
 	}
-	return
+	return nil
 }
 
-func unlockEcho() (err error) {
+func unlockEcho() error {
 	fd := tty.Fd()
-	if _, _, e := syscall.Syscall6(sysIoctl, fd, ioctlWriteTermios, uintptr(unsafe.Pointer(&oldState)), 0, 0, 0); e != 0 {
-		err = fmt.Errorf("Can't set terminal settings")
+	if err := term.Restore(int(fd), termState); err != nil {
+		return fmt.Errorf("error restores the terminal connected to the given file descriptor: %w", err)
 	}
-	return
+	return nil
 }

From f435c2ccd63371cf55b463e6d778c37b69692e8e Mon Sep 17 00:00:00 2001
From: dmitryk-dk <kozlovdmitriyy@gmail.com>
Date: Sun, 8 May 2022 15:34:32 +0300
Subject: [PATCH 2/5] used syscall

---
 v3/go.mod | 1 -
 v3/go.sum | 2 --
 2 files changed, 3 deletions(-)

diff --git a/v3/go.mod b/v3/go.mod
index 4d47460..dc8f265 100644
--- a/v3/go.mod
+++ b/v3/go.mod
@@ -6,7 +6,6 @@ require (
 	github.com/mattn/go-colorable v0.1.8
 	github.com/mattn/go-isatty v0.0.12
 	github.com/mattn/go-runewidth v0.0.12
-	golang.org/x/term v0.0.0-20220411215600-e5f449aeb171
 )
 
 require (
diff --git a/v3/go.sum b/v3/go.sum
index 4d5f9e0..49d2b3d 100644
--- a/v3/go.sum
+++ b/v3/go.sum
@@ -15,5 +15,3 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 h1:nonptSpoQ4vQjyraW20DXPAglgQfVnM9ZC6MmNLMR60=
 golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 h1:EH1Deb8WZJ0xc0WK//leUHXcX9aLE5SymusoTmMZye8=
-golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

From 684eb1bf7ce3f682a1d927815043957974cfa220 Mon Sep 17 00:00:00 2001
From: dmitryk-dk <kozlovdmitriyy@gmail.com>
Date: Sun, 8 May 2022 15:34:25 +0300
Subject: [PATCH 3/5] used syscall

---
 v3/termutil/term_x.go | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/v3/termutil/term_x.go b/v3/termutil/term_x.go
index 2484fa0..0b48aae 100644
--- a/v3/termutil/term_x.go
+++ b/v3/termutil/term_x.go
@@ -7,8 +7,6 @@ import (
 	"os"
 	"syscall"
 	"unsafe"
-
-	"golang.org/x/term"
 )
 
 var (
@@ -17,7 +15,7 @@ var (
 	unlockSignals = []os.Signal{
 		os.Interrupt, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGKILL,
 	}
-	termState *term.State
+	oldState syscall.Termios
 )
 
 type window struct {
@@ -58,16 +56,23 @@ func TerminalSize() (rows, cols int, err error) {
 func lockEcho() error {
 	fd := tty.Fd()
 
-	var err error
-	if termState, err = term.MakeRaw(int(fd)); err != nil {
+	if _, _, err := syscall.Syscall(sysIoctl, fd, ioctlReadTermios, uintptr(unsafe.Pointer(&oldState))); err != 0 {
 		return fmt.Errorf("error when puts the terminal connected to the given file descriptor: %v", err)
 	}
+
+	newState := oldState
+	newState.Lflag &^= syscall.ECHO
+	newState.Lflag |= syscall.ICANON | syscall.ISIG
+	newState.Iflag |= syscall.ICRNL
+	if _, _, e := syscall.Syscall(sysIoctl, fd, ioctlWriteTermios, uintptr(unsafe.Pointer(&newState))); e != 0 {
+		return fmt.Errorf("error update terminal settings: %v", e)
+	}
 	return nil
 }
 
 func unlockEcho() error {
 	fd := tty.Fd()
-	if err := term.Restore(int(fd), termState); err != nil {
+	if _, _, err := syscall.Syscall(sysIoctl, fd, ioctlWriteTermios, uintptr(unsafe.Pointer(&oldState))); err != 0 {
 		return fmt.Errorf("error restores the terminal connected to the given file descriptor: %w", err)
 	}
 	return nil

From 55fa2cccddcccf3d3643dda37ff2246a9d7110e3 Mon Sep 17 00:00:00 2001
From: dmitryk-dk <kozlovdmitriyy@gmail.com>
Date: Mon, 9 May 2022 15:33:34 +0300
Subject: [PATCH 4/5] rollback old build rules

---
 v3/termutil/term_appengine.go | 1 +
 v3/termutil/term_bsd.go       | 2 ++
 v3/termutil/term_linux.go     | 1 +
 v3/termutil/term_nix.go       | 2 ++
 v3/termutil/term_solaris.go   | 1 +
 v3/termutil/term_win.go       | 1 +
 v3/termutil/term_x.go         | 6 ++++--
 7 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/v3/termutil/term_appengine.go b/v3/termutil/term_appengine.go
index 765ff2b..6bc5c51 100644
--- a/v3/termutil/term_appengine.go
+++ b/v3/termutil/term_appengine.go
@@ -1,4 +1,5 @@
 //go:build appengine
+// +build appengine
 
 package termutil
 
diff --git a/v3/termutil/term_bsd.go b/v3/termutil/term_bsd.go
index d29404a..e16380f 100644
--- a/v3/termutil/term_bsd.go
+++ b/v3/termutil/term_bsd.go
@@ -1,4 +1,6 @@
 //go:build (darwin || freebsd || netbsd || openbsd || dragonfly) && !appengine
+// +build darwin freebsd netbsd openbsd dragonfly
+// +build !appengine
 
 package termutil
 
diff --git a/v3/termutil/term_linux.go b/v3/termutil/term_linux.go
index bec62af..f4c5325 100644
--- a/v3/termutil/term_linux.go
+++ b/v3/termutil/term_linux.go
@@ -1,4 +1,5 @@
 //go:build linux && !appengine
+// +build linux,!appengine
 
 package termutil
 
diff --git a/v3/termutil/term_nix.go b/v3/termutil/term_nix.go
index 4513e37..471d5a9 100644
--- a/v3/termutil/term_nix.go
+++ b/v3/termutil/term_nix.go
@@ -1,4 +1,6 @@
 //go:build (linux || darwin || freebsd || netbsd || openbsd || dragonfly) && !appengine
+// +build linux darwin freebsd netbsd openbsd dragonfly
+// +build !appengine
 
 package termutil
 
diff --git a/v3/termutil/term_solaris.go b/v3/termutil/term_solaris.go
index 02cfabf..45f3055 100644
--- a/v3/termutil/term_solaris.go
+++ b/v3/termutil/term_solaris.go
@@ -1,4 +1,5 @@
 //go:build solaris && !appengine
+// +build solaris,!appengine
 
 package termutil
 
diff --git a/v3/termutil/term_win.go b/v3/termutil/term_win.go
index 1ccf131..75c7e2c 100644
--- a/v3/termutil/term_win.go
+++ b/v3/termutil/term_win.go
@@ -1,4 +1,5 @@
 //go:build windows
+// +build windows
 
 package termutil
 
diff --git a/v3/termutil/term_x.go b/v3/termutil/term_x.go
index 0b48aae..4746e9b 100644
--- a/v3/termutil/term_x.go
+++ b/v3/termutil/term_x.go
@@ -1,4 +1,6 @@
 //go:build (linux || darwin || freebsd || netbsd || openbsd || solaris || dragonfly) && !appengine
+// +build linux darwin freebsd netbsd openbsd solaris dragonfly
+// +build !appengine
 
 package termutil
 
@@ -57,7 +59,7 @@ func lockEcho() error {
 	fd := tty.Fd()
 
 	if _, _, err := syscall.Syscall(sysIoctl, fd, ioctlReadTermios, uintptr(unsafe.Pointer(&oldState))); err != 0 {
-		return fmt.Errorf("error when puts the terminal connected to the given file descriptor: %v", err)
+		return fmt.Errorf("error when puts the terminal connected to the given file descriptor: %w", err)
 	}
 
 	newState := oldState
@@ -65,7 +67,7 @@ func lockEcho() error {
 	newState.Lflag |= syscall.ICANON | syscall.ISIG
 	newState.Iflag |= syscall.ICRNL
 	if _, _, e := syscall.Syscall(sysIoctl, fd, ioctlWriteTermios, uintptr(unsafe.Pointer(&newState))); e != 0 {
-		return fmt.Errorf("error update terminal settings: %v", e)
+		return fmt.Errorf("error update terminal settings: %w", e)
 	}
 	return nil
 }

From 8830ba567c836907da6999d470e8c8e02b28ed31 Mon Sep 17 00:00:00 2001
From: dmitryk-dk <kozlovdmitriyy@gmail.com>
Date: Mon, 9 May 2022 15:51:16 +0300
Subject: [PATCH 5/5] rollback go version

---
 v3/go.mod | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/v3/go.mod b/v3/go.mod
index dc8f265..7f0eb4f 100644
--- a/v3/go.mod
+++ b/v3/go.mod
@@ -6,11 +6,8 @@ require (
 	github.com/mattn/go-colorable v0.1.8
 	github.com/mattn/go-isatty v0.0.12
 	github.com/mattn/go-runewidth v0.0.12
-)
-
-require (
 	github.com/rivo/uniseg v0.2.0 // indirect
 	golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
 )
 
-go 1.18
+go 1.12