diff options
| author | Marcus Arendt <[email protected]> | 2014-05-22 10:38:18 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-05-22 10:38:18 +0200 |
| commit | f64c39daeff68af63b1864bf11313d566768a37f (patch) | |
| tree | 27bcdeca45db53afbbcff2b94dc25d3a50db094f /lib/ssh | |
| parent | c22b0017e872ae3c0816092ed92e1fbc76a8e07b (diff) | |
| parent | 4525bc59822acf0dfffa1edc64125c180d29e59e (diff) | |
| download | otp-f64c39daeff68af63b1864bf11313d566768a37f.tar.gz otp-f64c39daeff68af63b1864bf11313d566768a37f.tar.bz2 otp-f64c39daeff68af63b1864bf11313d566768a37f.zip | |
Merge branch 'jv/ssh-io-binary' into maint
* jv/ssh-io-binary:
Support binary standard_input in ssh_io
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/src/ssh_io.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh_io.erl b/lib/ssh/src/ssh_io.erl index 832b144db9..35336bce8b 100644 --- a/lib/ssh/src/ssh_io.erl +++ b/lib/ssh/src/ssh_io.erl @@ -81,6 +81,8 @@ format(Fmt, Args) -> trim(Line) when is_list(Line) -> lists:reverse(trim1(lists:reverse(trim1(Line)))); +trim(Line) when is_binary(Line) -> + trim(unicode:characters_to_list(Line)); trim(Other) -> Other. trim1([$\s|Cs]) -> trim(Cs); |