diff options
author | Siri Hansen <[email protected]> | 2013-01-18 17:38:11 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2013-01-25 15:56:00 +0100 |
commit | 9c262fece1241bd006cd78ce84b63e4924c55325 (patch) | |
tree | 5bfbbbba6ca5128682790dc437f3020f00cf4d40 /lib/test_server/src/ts_install.erl | |
parent | c463aaf0355d3a958df2335d13dc88aafb667f40 (diff) | |
download | otp-9c262fece1241bd006cd78ce84b63e4924c55325.tar.gz otp-9c262fece1241bd006cd78ce84b63e4924c55325.tar.bz2 otp-9c262fece1241bd006cd78ce84b63e4924c55325.zip |
[ts] Use unicode:characters_to_list/2 instead of binary_to_list/1
When reading text files with file:read_file/1, assume that the file
has the default encding (epp:default_encoding()) and covert the binary
to string by unicode:characters_to_list(Bin,DefaultEncoding) instead
of binary_to_list(Bin) as before.
Diffstat (limited to 'lib/test_server/src/ts_install.erl')
-rw-r--r-- | lib/test_server/src/ts_install.erl | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/test_server/src/ts_install.erl b/lib/test_server/src/ts_install.erl index ba8952f10f..e9e559df5d 100644 --- a/lib/test_server/src/ts_install.erl +++ b/lib/test_server/src/ts_install.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2012. All Rights Reserved. +%% Copyright Ericsson AB 1997-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -93,7 +93,7 @@ autoconf1(_,_) -> throw(cross_installation_failed). autoconf2({ok, Bin}) -> - get_vars(binary_to_list(Bin), name, [], []); + get_vars(ts_lib:b2s(Bin), name, [], []); autoconf2(Error) -> Error. @@ -170,12 +170,12 @@ parse_xcomp_file(Filepath) -> parse_xcomp_file([<<A:8,_/binary>> = Line|R],Envs,Flags) when $A =< A, A =< $Z -> [Var,Value] = binary:split(Line,<<"=">>), - parse_xcomp_file(R,[{binary_to_list(Var), - binary_to_list(Value)}|Envs],Flags); + parse_xcomp_file(R,[{ts_lib:b2s(Var), + ts_lib:b2s(Value)}|Envs],Flags); parse_xcomp_file([<<"erl_xcomp_",Line/binary>>|R],Envs,Flags) -> [Var,Value] = binary:split(Line,<<"=">>), - parse_xcomp_file(R,Envs,[{binary_to_list(Var), - binary_to_list(Value)}|Flags]); + parse_xcomp_file(R,Envs,[{ts_lib:b2s(Var), + ts_lib:b2s(Value)}|Flags]); parse_xcomp_file([_|R],Envs,Flags) -> parse_xcomp_file(R,Envs,Flags); parse_xcomp_file([],Envs,Flags) -> @@ -407,4 +407,3 @@ extra_platform_label() -> [_|_]=Label -> "/" ++ Label; false -> "" end. - |