aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <[email protected]>2015-01-26 09:54:48 +0100
committerJosé Valim <[email protected]>2015-01-26 10:02:02 +0100
commit6d680342efe0f66cd0f975373be65af8fd3703a1 (patch)
treefb4009a7e0dc67df408d6418120ec71ab37140e5
parent8304aeb0114e61e8f694a58cf9e91a00856c3fe5 (diff)
downloadotp-6d680342efe0f66cd0f975373be65af8fd3703a1.tar.gz
otp-6d680342efe0f66cd0f975373be65af8fd3703a1.tar.bz2
otp-6d680342efe0f66cd0f975373be65af8fd3703a1.zip
Support binary standard input in ets:i/1
-rw-r--r--lib/stdlib/src/ets.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/stdlib/src/ets.erl b/lib/stdlib/src/ets.erl
index 42b11a97e2..93c4f59896 100644
--- a/lib/stdlib/src/ets.erl
+++ b/lib/stdlib/src/ets.erl
@@ -1613,13 +1613,18 @@ choice(Height, Width, P, Mode, Tab, Key, Turn, Opos) ->
end.
get_line(P, Default) ->
- case io:get_line(P) of
+ case line_string(io:get_line(P)) of
"\n" ->
Default;
L ->
L
end.
+%% If the standard input is set to binary mode
+%% convert it to a list so we can properly match.
+line_string(Binary) when is_binary(Binary) -> unicode:characters_to_list(Binary);
+line_string(Other) -> Other.
+
nonl(S) -> string:strip(S, right, $\n).
print_number(Tab, Key, Num) ->