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] 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
 }