1 files changed, 51 insertions, 38 deletions

diff --git a/lib/sasl/src/sasl_report.erl b/lib/sasl/src/sasl_report.erl
index 14702b0ad2..e6556ec6ce 100644
--- a/lib/sasl/src/sasl_report.erl
+++ b/lib/sasl/src/sasl_report.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -47,6 +47,7 @@ io_report(_IO, _Fd, _, _) ->
 is_my_error_report(all, Type)   ->  is_my_error_report(Type);
 is_my_error_report(error, Type) ->  is_my_error_report(Type);
 is_my_error_report(_, _Type)    ->  false.
+
 is_my_error_report(supervisor_report)   -> true;
 is_my_error_report(crash_report)        -> true;
 is_my_error_report(_)                   -> false.
@@ -54,6 +55,7 @@ is_my_error_report(_)                   -> false.
 is_my_info_report(all, Type)      -> is_my_info_report(Type);
 is_my_info_report(progress, Type) -> is_my_info_report(Type);
 is_my_info_report(_, _Type)       -> false.
+
 is_my_info_report(progress)  -> true;
 is_my_info_report(_)                    -> false.
 
@@ -62,54 +64,65 @@ write_report2(IO, Fd, Head, supervisor_report, Report) ->
     Context = sup_get(errorContext, Report),
     Reason = sup_get(reason, Report),
     Offender = sup_get(offender, Report),
-    {FmtString,Args} = supervisor_format([Name,Context,Reason,Offender]),
-    write_report_action(IO, Fd, Head, FmtString, Args);
+    Enc = encoding(Fd),
+    {FmtString,Args} = supervisor_format([Name,Context,Reason,Offender], Enc),
+    String = io_lib:format(FmtString, Args),
+    write_report_action(IO, Fd, Head, String);
 write_report2(IO, Fd, Head, progress, Report) ->
-    Format = format_key_val(Report),
-    write_report_action(IO, Fd, Head, "~s", [Format]);
+    Encoding = encoding(Fd),
+    Depth = error_logger:get_format_depth(),
+    String = format_key_val(Report, Encoding, Depth),
+    write_report_action(IO, Fd, Head, String);
 write_report2(IO, Fd, Head, crash_report, Report) ->
-    Depth = get_depth(),
-    Format = proc_lib:format(Report, latin1, Depth),
-    write_report_action(IO, Fd, Head, "~s", [Format]).
-
-supervisor_format(Args0) ->
-    case get_depth() of
-	unlimited ->
-	    {"     Supervisor: ~p~n"
-	     "     Context:    ~p~n"
-	     "     Reason:     ~80.18p~n"
-	     "     Offender:   ~80.18p~n~n",
-	     Args0};
-	Depth ->
-	    [A,B,C,D] = Args0,
-	    Args = [A,Depth,B,Depth,C,Depth,D,Depth],
-	    {"     Supervisor: ~P~n"
-	     "     Context:    ~P~n"
-	     "     Reason:     ~80.18P~n"
-	     "     Offender:   ~80.18P~n~n",
-	     Args}
-    end.
-
-write_report_action(IO, Fd, Head, Format, Args) ->
-    S = [Head|io_lib:format(Format, Args)],
+    Encoding = encoding(Fd),
+    Depth = error_logger:get_format_depth(),
+    String = proc_lib:format(Report, Encoding, Depth),
+    write_report_action(IO, Fd, Head, String).
+
+supervisor_format(Args0, Encoding) ->
+    {P, Tl} = p(Encoding, error_logger:get_format_depth()),
+    [A,B,C,D] = Args0,
+    Args = [A|Tl] ++ [B|Tl] ++ [C|Tl] ++ [D|Tl],
+    {"     Supervisor: ~" ++ P ++ "\n"
+     "     Context:    ~" ++ P ++ "\n"
+     "     Reason:     ~80.18" ++ P ++ "\n"
+     "     Offender:   ~80.18" ++ P ++ "\n~n",
+     Args}.
+
+write_report_action(IO, Fd, Head, String) ->
+    S = [Head|String],
     case IO of
 	io -> io:put_chars(Fd, S);
 	io_lib -> S
     end.
 
-format_key_val([{Tag,Data}|Rep]) ->
-    io_lib:format("    ~16w: ~p~n",[Tag,Data]) ++ format_key_val(Rep);
-format_key_val(_) ->
+format_key_val(Rep, Encoding, Depth) ->
+    {P, Tl} = p(Encoding, Depth),
+    format_key_val1(Rep, P, Tl).
+
+format_key_val1([{Tag,Data}|Rep], P, Tl) ->
+    (io_lib:format("    ~16w: ~" ++ P ++ "\n", [Tag, Data|Tl]) ++
+     format_key_val1(Rep, P, Tl));
+format_key_val1(_, _, _) ->
     [].
 
-get_depth() ->
-    case application:get_env(kernel, error_logger_format_depth) of
-	{ok, Depth} when is_integer(Depth) ->
-	    max(10, Depth);
-	undefined ->
-	    unlimited
+p(Encoding, Depth) ->
+    {Letter, Tl}  = case Depth of
+                        unlimited -> {"p", []};
+                        _         -> {"P", [Depth]}
+                    end,
+    P = modifier(Encoding) ++ Letter,
+    {P, Tl}.
+
+encoding(IO) ->
+    case lists:keyfind(encoding, 1, io:getopts(IO)) of
+	false -> latin1;
+	{encoding, Enc} -> Enc
     end.
 
+modifier(latin1) -> "";
+modifier(_) -> "t".
+
 sup_get(Tag, Report) ->
     case lists:keysearch(Tag, 1, Report) of
 	{value, {_, Value}} ->