diff --git a/tools/tui/loop/api.go b/tools/tui/loop/api.go index a4a7b8be6..1236e6212 100644 --- a/tools/tui/loop/api.go +++ b/tools/tui/loop/api.go @@ -273,7 +273,7 @@ func (self *Loop) Run() (err error) { defer term.RestoreAndClose() fmt.Println("Press any key to exit.\r") buf := make([]byte, 16) - term.Read(buf) + _, _ = term.Read(buf) } } } diff --git a/tools/tui/loop/run.go b/tools/tui/loop/run.go index 5de444cea..0e76e856a 100644 --- a/tools/tui/loop/run.go +++ b/tools/tui/loop/run.go @@ -42,7 +42,7 @@ func is_temporary_error(err error) bool { } func kill_self(sig unix.Signal) { - unix.Kill(os.Getpid(), sig) + _ = unix.Kill(os.Getpid(), sig) // Give the signal time to be delivered time.Sleep(20 * time.Millisecond) } @@ -189,10 +189,11 @@ func (self *Loop) handle_rune(raw rune) error { return nil } -func (self *Loop) handle_end_of_bracketed_paste() { +func (self *Loop) handle_end_of_bracketed_paste() error { if self.OnText != nil { - self.OnText("", false, false) + return self.OnText("", false, false) } + return nil } func (self *Loop) on_signal(s unix.Signal) error { @@ -397,7 +398,7 @@ func (self *Loop) run() (err error) { return err } err = controlling_term.SuspendAndRun(func() error { - unix.Kill(os.Getpid(), unix.SIGSTOP) + _ = unix.Kill(os.Getpid(), unix.SIGSTOP) time.Sleep(20 * time.Millisecond) return nil }) diff --git a/tools/wcswidth/escape-code-parser.go b/tools/wcswidth/escape-code-parser.go index 0a1dfa7db..38e1aee10 100644 --- a/tools/wcswidth/escape-code-parser.go +++ b/tools/wcswidth/escape-code-parser.go @@ -52,7 +52,7 @@ type EscapeCodeParser struct { // Callbacks HandleRune func(rune) error - HandleEndOfBracketedPaste func() + HandleEndOfBracketedPaste func() error HandleCSI func([]byte) error HandleOSC func([]byte) error HandleDCS func([]byte) error @@ -199,7 +199,9 @@ func (self *EscapeCodeParser) dispatch_char(ch utils.UTF8State) error { if self.bracketed_paste_buffer[len(self.bracketed_paste_buffer)-1] == '~' { self.reset_state() if self.HandleEndOfBracketedPaste != nil { - self.HandleEndOfBracketedPaste() + if err := self.HandleEndOfBracketedPaste(); err != nil { + return err + } } } return nil