Merge branch 'siri/unicode-atoms/OTP-14285'

* siri/unicode-atoms/OTP-14285:
  [sasl] Improve handling of unicode in rb
  [ttb] Handle unicode atoms in trace data and config files
  [dbg] Update default trace handler to print unicode atoms correctly
  [etop] Fix handling of unicode atoms
  [stdlib] Open sys debug logs as utf8
  [stdlib] Open error log file as utf8
  [sasl] Improve handling of unicode atoms
  [ct] Print unicode atoms and strings correctly in common_test logs

1 files changed, 17 insertions, 1 deletions

diff --git a/lib/sasl/src/misc_supp.erl b/lib/sasl/src/misc_supp.erl
index 093b337a2c..b32f63ebf4 100644
--- a/lib/sasl/src/misc_supp.erl
+++ b/lib/sasl/src/misc_supp.erl
@@ -32,7 +32,7 @@
 %%%---------------------------------------------------------------------
 
 -export([format_pdict/3, format_tuples/2, assq/2, passq/2, is_string/1, 
-	 multi_map/2]).
+	 multi_map/2, modifier/1]).
 
 %%-----------------------------------------------------------------
 %% Uses format_tuples to format the data in process dictionary.
@@ -105,3 +105,19 @@ multi_map(Func, ListOfLists) ->
     [apply(Func, lists:map(fun(List) -> hd(List) end, ListOfLists)) |
      multi_map(Func,
 	       lists:map(fun(List) -> tl(List) end, ListOfLists))].
+
+%%%-----------------------------------------------------------------
+%%% Check encoding of the given device and return "t" if this format
+%%% modifier should be used.
+modifier(Device) ->
+    Encoding =
+        case io:getopts(Device) of
+            List when is_list(List) ->
+                proplists:get_value(encoding,List,latin1);
+            _ ->
+                latin1
+        end,
+    encoding_to_modifier(Encoding).
+
+encoding_to_modifier(latin1) -> "";
+encoding_to_modifier(_) -> "t".