aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/src
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2013-06-04 12:38:31 +0200
committerDan Gudmundsson <[email protected]>2013-06-04 12:38:31 +0200
commite83fd8f94aba352b6cc055d2b4cfff007911b6d4 (patch)
tree66b22e7e79813d9ec2b0f5a9817a3908682a22ee /lib/sasl/src
parente00d6bbbabd7b76c050665fc417e81554a83e341 (diff)
parentee23d4b549618044d4a4f800db839483b359cb9f (diff)
downloadotp-e83fd8f94aba352b6cc055d2b4cfff007911b6d4.tar.gz
otp-e83fd8f94aba352b6cc055d2b4cfff007911b6d4.tar.bz2
otp-e83fd8f94aba352b6cc055d2b4cfff007911b6d4.zip
Merge branch 'dgud/win32_unicode'
* dgud/win32_unicode: erts: Windows, convert erlsrv to use widestring erts: Window start_erl now uses widechars/unicode Quote windows paths with spaces Handle space in paths in test Makefiles erts: Fix windows widestring args and paths in tools erts: Windows, use widechars for all paths during startup OTP-11135
Diffstat (limited to 'lib/sasl/src')
-rw-r--r--lib/sasl/src/erlsrv.erl9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/sasl/src/erlsrv.erl b/lib/sasl/src/erlsrv.erl
index 086dc7c651..711c1c6f1c 100644
--- a/lib/sasl/src/erlsrv.erl
+++ b/lib/sasl/src/erlsrv.erl
@@ -71,11 +71,14 @@ write_all_data(Port,[]) ->
Port ! {self(), {command, io_lib:nl()}},
ok;
write_all_data(Port,[H|T]) ->
- Port ! {self(), {command, H ++ io_lib:nl()}},
+ Port ! {self(), {command, unicode:characters_to_binary([H,io_lib:nl()])}},
write_all_data(Port,T).
read_all_data(Port) ->
- lists:reverse(read_all_data(Port,[],[])).
+ Data0 = lists:reverse(read_all_data(Port,[],[])),
+ %% Convert from utf8 to a list of chars
+ [unicode:characters_to_list(list_to_binary(Data)) || Data <- Data0].
+
read_all_data(Port,Line,Lines) ->
receive
{Port, {data, {noeol,Data}}} ->
@@ -178,7 +181,7 @@ get_service(EVer, ServiceName) ->
[]
end
end,
- %%% First split by Env:
+ %%% First split by Env:
{Before, After} = split_by_env(Data),
FirstPass = lists:flatten(lists:map(F,Before)),
%%% If the arguments are there, split them to