Merge pull request #439 from restic/fix-402

Add cleanup handler to restore terminal state
This commit is contained in:
Alexander Neumann 2016-02-13 19:14:59 +01:00
commit 50380f8c14
1 changed files with 43 additions and 0 deletions

View File

@ -6,6 +6,7 @@ import (
"io"
"os"
"strings"
"syscall"
"github.com/jessevdk/go-flags"
"github.com/restic/restic/backend"
@ -34,6 +35,48 @@ type GlobalOptions struct {
stderr io.Writer
}
func init() {
restoreTerminal()
}
// checkErrno returns nil when err is set to syscall.Errno(0), since this is no
// error condition.
func checkErrno(err error) error {
e, ok := err.(syscall.Errno)
if !ok {
return err
}
if e == 0 {
return nil
}
return err
}
// restoreTerminal installs a cleanup handler that restores the previous
// terminal state on exit.
func restoreTerminal() {
fd := int(os.Stdout.Fd())
if !terminal.IsTerminal(fd) {
return
}
state, err := terminal.GetState(fd)
if err != nil {
fmt.Fprintf(os.Stderr, "unable to get terminal state: %v\n", err)
return
}
AddCleanupHandler(func() error {
err := checkErrno(terminal.Restore(fd, state))
if err != nil {
fmt.Fprintf(os.Stderr, "unable to get restore terminal state: %#+v\n", err)
}
return err
})
}
var globalOpts = GlobalOptions{stdout: os.Stdout, stderr: os.Stderr}
var parser = flags.NewParser(&globalOpts, flags.HelpFlag|flags.PassDoubleDash)