diff options
| author | Björn Gustavsson <[email protected]> | 2013-02-19 07:21:04 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-02-19 07:21:04 +0100 |
| commit | abece06800425067ca8f99d770e6269182c0de72 (patch) | |
| tree | daf7f5fbe6c3911d6bb054ae873e18334d37404f /erts | |
| parent | 2c6b13d13ef25a7995d5efeeaf735942a2cc9d21 (diff) | |
| parent | e7a077c639cab73abee9d6a717241087aaa4e59c (diff) | |
| download | otp-abece06800425067ca8f99d770e6269182c0de72.tar.gz otp-abece06800425067ca8f99d770e6269182c0de72.tar.bz2 otp-abece06800425067ca8f99d770e6269182c0de72.zip | |
Merge branch 'pan/unicode_filename_warnings'
* pan/unicode_filename_warnings:
Update file_name_SUITE
Fix broken file:read_link_all/1
Fix broken prim_file:list_dir_all/1
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/preloaded/ebin/prim_file.beam | bin | 44092 -> 44132 bytes | |||
| -rw-r--r-- | erts/preloaded/src/prim_file.erl | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam Binary files differindex f7b3aac376..b64fe522e8 100644 --- a/erts/preloaded/ebin/prim_file.beam +++ b/erts/preloaded/ebin/prim_file.beam diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl index bf8879c2a0..b40a6d9633 100644 --- a/erts/preloaded/src/prim_file.erl +++ b/erts/preloaded/src/prim_file.erl @@ -990,9 +990,9 @@ list_dir_convert_all([Name|Names]) -> %% a binary. case prim_file:internal_native2name(Name) of {error, _} -> - [Name|list_dir_convert(Names)]; + [Name|list_dir_convert_all(Names)]; Converted when is_list(Converted) -> - [Converted|list_dir_convert(Names)] + [Converted|list_dir_convert_all(Names)] end; list_dir_convert_all([]) -> []. |