diff options
| author | Marcus Arendt <[email protected]> | 2014-05-22 10:40:57 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-05-22 10:40:57 +0200 |
| commit | fcd95cafef819a0950c315e32d9f5fcba7ebf0fb (patch) | |
| tree | 17404e1ee702f778fc5b7cafbe11f9d2b787c2cd /lib/ssh | |
| parent | 3cfd04c00e109c01f4b74cbef77e7debfef089b8 (diff) | |
| parent | 97ec79ab4ab2e00de42e69534b0181eeccbadfc8 (diff) | |
| download | otp-fcd95cafef819a0950c315e32d9f5fcba7ebf0fb.tar.gz otp-fcd95cafef819a0950c315e32d9f5fcba7ebf0fb.tar.bz2 otp-fcd95cafef819a0950c315e32d9f5fcba7ebf0fb.zip | |
Merge branch 'maint'
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); |