diff options
| author | Patrik Nyblom <[email protected]> | 2012-08-20 17:52:49 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-08-20 17:52:49 +0200 |
| commit | a49b1a844febb2740c530895b32c0bb0ae7d5aa0 (patch) | |
| tree | 6e005b76b80ef0c8f629f291986087f51cbd5aff /erts/preloaded | |
| parent | 4e8f6f2e2cdec0e94f5b4e1a1a878190e4d01704 (diff) | |
| parent | 0c387e88d5a6dc97466ec33088aa9798eeb1d16d (diff) | |
| download | otp-a49b1a844febb2740c530895b32c0bb0ae7d5aa0.tar.gz otp-a49b1a844febb2740c530895b32c0bb0ae7d5aa0.tar.bz2 otp-a49b1a844febb2740c530895b32c0bb0ae7d5aa0.zip | |
Merge branch 'pan/unicode_home/OTP-10160' into maint
* pan/unicode_home/OTP-10160:
Teach release_handler_SUITE about file:native_name_encoding/0
Add documetation about Unicode in environment
Make get/putenv and erlexec understand Unicode
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/init.beam | bin | 48064 -> 48292 bytes | |||
| -rw-r--r-- | erts/preloaded/src/init.erl | 6 |
2 files changed, 5 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam Binary files differindex cc170b86b2..9f2d369af2 100644 --- a/erts/preloaded/ebin/init.beam +++ b/erts/preloaded/ebin/init.beam diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl index c9c434dea0..708991e261 100644 --- a/erts/preloaded/src/init.erl +++ b/erts/preloaded/src/init.erl @@ -1252,7 +1252,11 @@ get_arguments([]) -> []. to_strings([H|T]) when is_atom(H) -> [atom_to_list(H)|to_strings(T)]; -to_strings([H|T]) when is_binary(H) -> [binary_to_list(H)|to_strings(T)]; +to_strings([H|T]) when is_binary(H) -> [try + unicode:characters_to_list(H,file:native_name_encoding()) + catch + _:_ -> binary_to_list(H) + end|to_strings(T)]; to_strings([]) -> []. get_argument(Arg,Flags) -> |