diff options
author | Felix Lange <fjl@twurst.com> | 2016-03-21 21:05:22 +0800 |
---|---|---|
committer | Felix Lange <fjl@twurst.com> | 2016-04-12 21:56:49 +0800 |
commit | dff9b4246f3ef9e6c254b57eef6d0433809f16b9 (patch) | |
tree | 71cab4093300a6e9bd1b5801f05e3507246eef7e /cmd/geth/main.go | |
parent | 83877a0f9d3d5716ee01393f10c2dfa19bb0310b (diff) | |
download | dexon-dff9b4246f3ef9e6c254b57eef6d0433809f16b9.tar dexon-dff9b4246f3ef9e6c254b57eef6d0433809f16b9.tar.gz dexon-dff9b4246f3ef9e6c254b57eef6d0433809f16b9.tar.bz2 dexon-dff9b4246f3ef9e6c254b57eef6d0433809f16b9.tar.lz dexon-dff9b4246f3ef9e6c254b57eef6d0433809f16b9.tar.xz dexon-dff9b4246f3ef9e6c254b57eef6d0433809f16b9.tar.zst dexon-dff9b4246f3ef9e6c254b57eef6d0433809f16b9.zip |
cmd/geth, cmd/utils: improve input handling
These changes make prompting behave consistently on all platforms:
* The input buffer is now global.
Buffering was previously set up for each prompt, which can cause weird
behaviour, e.g. when running "geth account update <input.txt" where
input.txt contains three lines. In this case, the first password
prompt would fill up the buffer with all lines and then use only the
first one.
* Print the "unsupported terminal" warning only once.
Now that stdin prompting has global state, we can use it to track
the warning there.
* Work around small liner issues, particularly on Windows.
Prompting didn't work under most of the third-party terminal emulators
on Windows because liner assumes line editing is always available.
Diffstat (limited to 'cmd/geth/main.go')
-rw-r--r-- | cmd/geth/main.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 584df7316..c83735e30 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -373,6 +373,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso app.After = func(ctx *cli.Context) error { logger.Flush() debug.Exit() + utils.Stdin.Close() // Resets terminal mode. return nil } } @@ -595,12 +596,12 @@ func getPassPhrase(prompt string, confirmation bool, i int, passwords []string) } // Otherwise prompt the user for the password fmt.Println(prompt) - password, err := utils.PromptPassword("Passphrase: ", true) + password, err := utils.Stdin.PasswordPrompt("Passphrase: ") if err != nil { utils.Fatalf("Failed to read passphrase: %v", err) } if confirmation { - confirm, err := utils.PromptPassword("Repeat passphrase: ", false) + confirm, err := utils.Stdin.PasswordPrompt("Repeat passphrase: ") if err != nil { utils.Fatalf("Failed to read passphrase confirmation: %v", err) } |