barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #132 from kortschak/repl

Browse source 
Fix error in REPL term shutdown leaving tty unsane
This commit is contained in:
Barak Michener 2014-08-21 13:26:54 -04:00
commit c8c7f1ff8c
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
db/repl.go
View file

@ -104,6 +104,7 @@ func Repl(h *graph.Handle, queryLanguage string, cfg *config.Config) error {
line, err := term.Prompt(prompt) line, err := term.Prompt(prompt)
if err != nil { if err != nil {
if err == io.EOF { if err == io.EOF {
fmt.Println()
return nil return nil
} }
return err return err
@ -170,9 +171,7 @@ func terminal(path string) (*liner.State, error) {
signal.Notify(c, os.Interrupt, os.Kill) signal.Notify(c, os.Interrupt, os.Kill)
<-c <-c
persist(term, history) err := persist(term, history)
err := term.Close()
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "failed to properly clean up terminal: %v\n", err) fmt.Fprintf(os.Stderr, "failed to properly clean up terminal: %v\n", err)
os.Exit(1) os.Exit(1)
@ -200,5 +199,5 @@ func persist(term *liner.State, path string) error {
if err != nil { if err != nil {
return fmt.Errorf("could not write history to %q: %v", path, err) return fmt.Errorf("could not write history to %q: %v", path, err)
} }
return nil return term.Close()
} }