flip/dcrd
1
0
Fork 0
mirror of https://github.com/FlipsideCrypto/dcrd.git synced 2026-02-06 10:56:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dcrctl: fix reading from stdin in terminal mode (#294)

Browse Source 
Fixes #77
This commit is contained in:
David Hill 2016-08-03 16:19:54 -04:00 committed by GitHub
parent 7feb573059
commit 9069906139
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/dcrctl/terminal.go
View File

@ -14,7 +14,7 @@ import (
"golang.org/x/crypto/ssh/terminal"
)
func execute(quit chan bool, protected *bool, cfg *config, line string, clear *bool) {
func execute(quit chan bool, protected *bool, cfg *config, line string, clear *bool, state *terminal.State) {
switch line {
case "h":
fmt.Printf("[h]elp print this message\n")
@ -80,7 +80,9 @@ func execute(quit chan bool, protected *bool, cfg *config, line string, clear *b
params := make([]interface{}, 0, len(args[1:]))
for _, arg := range args[1:] {
if arg == "-" {
terminal.Restore(int(os.Stdin.Fd()), state)
param, err := bio.ReadString('\n')
state, _ = terminal.MakeRaw(int(os.Stdin.Fd()))
if err != nil && err != io.EOF {
fmt.Fprintf(os.Stderr, "Failed to read data "+
"from stdin: %v\n", err)
@ -171,7 +173,7 @@ func startTerminal(c *config) {
fmt.Printf("Enter h for [h]elp.\n")
fmt.Printf("Enter q for [q]uit.\n")
done := make(chan bool)
initState, err := terminal.GetState(0)
initState, err := terminal.GetState(int(os.Stdin.Fd()))
protected := false
clear := false
if err != nil {
@ -180,7 +182,7 @@ func startTerminal(c *config) {
}
go func() {
terminal.MakeRaw(int(os.Stdin.Fd()))
termState, _ := terminal.MakeRaw(int(os.Stdin.Fd()))
n := terminal.NewTerminal(os.Stdin, "> ")
for {
var ln string
@ -196,10 +198,11 @@ func startTerminal(c *config) {
done <- true
}
}
execute(done, &protected, c, ln, &clear)
execute(done, &protected, c, ln, &clear, termState)
if clear {
fmt.Println("Clearing history...")
terminal.MakeRaw(int(os.Stdin.Fd()))
termState, _ = terminal.MakeRaw(int(os.Stdin.Fd()))
n = terminal.NewTerminal(os.Stdin, "> ")
clear = false
}
@ -208,7 +211,7 @@ func startTerminal(c *config) {
select {
case <-done:
fmt.Printf("exiting...\n")
terminal.Restore(0, initState)
terminal.Restore(int(os.Stdin.Fd()), initState)
close(done)
}
}