diff options
| author | Hans Nilsson <[email protected]> | 2017-07-07 14:33:05 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-07-07 14:33:05 +0200 |
| commit | 522e9e8fbcef3102293af23a0d05b106126789aa (patch) | |
| tree | 25c01132ae9b52b27188a867779887caed4db38f /lib/ssh | |
| parent | c0afc2ec4a46f2014dfd5a3ee571f49217febb1a (diff) | |
| parent | 0e9e2dadbee5dfcd78fb63a0120961a3782fe9a7 (diff) | |
| download | otp-522e9e8fbcef3102293af23a0d05b106126789aa.tar.gz otp-522e9e8fbcef3102293af23a0d05b106126789aa.tar.bz2 otp-522e9e8fbcef3102293af23a0d05b106126789aa.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/src/ssh_io.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh_io.erl b/lib/ssh/src/ssh_io.erl index 8ba759ad60..a7cd1daeec 100644 --- a/lib/ssh/src/ssh_io.erl +++ b/lib/ssh/src/ssh_io.erl @@ -31,8 +31,8 @@ read_line(Prompt, Opts) -> format("~s", [listify(Prompt)]), ?GET_INTERNAL_OPT(user_pid, Opts) ! {self(), question}, receive - Answer when is_list(Answer) -> - Answer + Answer when is_list(Answer) or is_binary(Answer) -> + unicode:characters_to_list(Answer) end. yes_no(Prompt, Opts) -> @@ -44,7 +44,7 @@ yes_no(Prompt, Opts) -> y -> yes; n -> no; - Answer when is_list(Answer) -> + Answer when is_list(Answer) or is_binary(Answer) -> case trim(Answer) of "y" -> yes; "n" -> no; @@ -60,7 +60,7 @@ read_password(Prompt, Opts) -> format("~s", [listify(Prompt)]), ?GET_INTERNAL_OPT(user_pid, Opts) ! {self(), user_password}, receive - Answer when is_list(Answer) -> + Answer when is_list(Answer) or is_binary(Answer) -> case trim(Answer) of "" -> read_password(Prompt, Opts); |