Merge branch 'maint'

4 files changed, 101 insertions, 45 deletions

diff --git a/lib/sasl/doc/src/sasl_app.xml b/lib/sasl/doc/src/sasl_app.xml
index 0576397f9b..e0693fcb60 100644
--- a/lib/sasl/doc/src/sasl_app.xml
+++ b/lib/sasl/doc/src/sasl_app.xml
@@ -103,13 +103,16 @@
           <tag><c>{file,FileName}</c></tag>
           <item><p>Installs <c>sasl_report_file_h</c> in the error logger.
             All reports go to file <c>FileName</c>, which is a
-            string.</p></item>
+            string. The file is opened in <c>write</c> mode with encoding
+	    <c>utf8</c>.</p></item>
           <tag><c>{file,FileName,Modes}</c></tag>
           <item><p>Same as <c>{file,FileName}</c>, except that <c>Modes</c>
             allows you to specify the modes used for opening the <c>FileName</c>
             given to the <seealso marker="kernel:file#open/2">file:open/2</seealso>
-            call. When not specified, <c>Modes</c> defaults to <c>[write]</c>.
-            Use <c>[append]</c> to have the <c>FileName</c> open in append mode.
+            call. By default, the file is opened in <c>write</c> mode
+            with encoding <c>utf8</c>. Use <c>[append]</c> to have
+            the <c>FileName</c> open in append mode. A different
+            encoding can also be specified.
             <c>FileName</c> is a string.</p></item>
           <tag><c>false</c></tag>
           <item><p>No SASL error logger handler is installed.</p></item>
diff --git a/lib/sasl/src/sasl_report.erl b/lib/sasl/src/sasl_report.erl
index eb454155d5..e6556ec6ce 100644
--- a/lib/sasl/src/sasl_report.erl
+++ b/lib/sasl/src/sasl_report.erl
@@ -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,46 +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) ->
+    Encoding = encoding(Fd),
     Depth = error_logger:get_format_depth(),
-    Format = proc_lib:format(Report, latin1, Depth),
-    write_report_action(IO, Fd, Head, "~s", [Format]).
-
-supervisor_format(Args0) ->
-    case error_logger:get_format_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)],
+    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(_, _, _) ->
     [].
 
+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}} ->
diff --git a/lib/sasl/src/sasl_report_file_h.erl b/lib/sasl/src/sasl_report_file_h.erl
index 21746839fa..d3b5c7dc0d 100644
--- a/lib/sasl/src/sasl_report_file_h.erl
+++ b/lib/sasl/src/sasl_report_file_h.erl
@@ -29,15 +29,27 @@
 	 handle_event/2, handle_call/2, handle_info/2,
 	 terminate/2]).
 
-init({File, Modes, Type}) when is_list(Modes) ->
+init({File, Modes0, Type}) when is_list(Modes0) ->
     process_flag(trap_exit, true),
+    Modes1 =
+        case lists:keymember(encoding,1,Modes0) of
+            true -> Modes0;
+            false -> [{encoding,utf8}|Modes0]
+        end,
+    Modes =
+        case [M || M <- Modes1, lists:member(M,[write,append,exclusive])] of
+            [] ->
+                [write|Modes1];
+            _ ->
+                Modes1
+        end,
     case file:open(File, Modes) of
 	{ok,Fd} ->
 	    {ok, {Fd, File, Type}};
 	What ->
 	    What
     end.
-    
+
 handle_event({_Type, GL, _Msg}, State) when node(GL) /= node() ->
     {ok, State};
 handle_event(Event, {Fd, File, Type}) ->
diff --git a/lib/sasl/test/sasl_report_SUITE.erl b/lib/sasl/test/sasl_report_SUITE.erl
index 53fb614921..92df5e6e40 100644
--- a/lib/sasl/test/sasl_report_SUITE.erl
+++ b/lib/sasl/test/sasl_report_SUITE.erl
@@ -20,7 +20,7 @@
 -module(sasl_report_SUITE).
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
 	 init_per_group/2,end_per_group/2]).
--export([gen_server_crash/1]).
+-export([gen_server_crash/1, gen_server_crash_unicode/1]).
 
 -export([crash_me/0,start_link/0,init/1,handle_cast/2,terminate/2]).
 
@@ -29,7 +29,7 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() ->
-    [gen_server_crash].
+    [gen_server_crash, gen_server_crash_unicode].
 
 groups() ->
     [].
@@ -47,8 +47,14 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 gen_server_crash(Config) ->
+    gen_server_crash(Config, latin1).
+
+gen_server_crash_unicode(Config) ->
+    gen_server_crash(Config, unicode).
+
+gen_server_crash(Config, Encoding) ->
     try
-	do_gen_server_crash(Config)
+	do_gen_server_crash(Config, Encoding)
     after
 	error_logger:tty(true),
 	ok = application:unset_env(sasl, sasl_error_logger),
@@ -57,7 +63,7 @@ gen_server_crash(Config) ->
     end,
     ok.
 
-do_gen_server_crash(Config) ->
+do_gen_server_crash(Config, Encoding) ->
     PrivDir = ?config(priv_dir, Config),
     LogDir = filename:join(PrivDir, ?MODULE),
     KernelLog = filename:join(LogDir, "kernel.log"),
@@ -67,7 +73,8 @@ do_gen_server_crash(Config) ->
     error_logger:delete_report_handler(cth_log_redirect),
     error_logger:tty(false),
     application:stop(sasl),
-    ok = application:set_env(sasl, sasl_error_logger, {file,SaslLog},
+    Modes = [write, {encoding, Encoding}],
+    ok = application:set_env(sasl, sasl_error_logger, {file,SaslLog,Modes},
 			     [{persistent,true}]),
     application:set_env(kernel, error_logger_format_depth, 30),
     error_logger:logfile({open,KernelLog}),
@@ -78,16 +85,21 @@ do_gen_server_crash(Config) ->
 
     error_logger:logfile(close),
 
-    check_file(KernelLog, 70000, 150000),
-    check_file(SaslLog, 100000, 150000),
+    check_file(KernelLog, utf8, 70000, 150000),
+    check_file(SaslLog, Encoding, 70000, 150000),
 
+    %% ok = file:delete(KernelLog),
+    %% ok = file:delete(SaslLog),
     ok.
 
-check_file(File, Min, Max) ->
+check_file(File, Encoding, Min, Max) ->
     {ok,Bin} = file:read_file(File),
     Base = filename:basename(File),
     io:format("*** Contents of ~s ***\n", [Base]),
-    io:put_chars([Bin,"\n"]),
+    case Encoding of
+        latin1 -> io:format("~s\n", [Bin]);
+        _ -> io:format("~ts\n", [Bin])
+    end,
     Sz = byte_size(Bin),
     io:format("Size: ~p (allowed range is ~p..~p)\n",
 	      [Sz,Min,Max]),
@@ -110,7 +122,9 @@ crash_me() ->
     {ok,SuperPid} = supervisor:start_link(sasl_report_suite_supervisor, []),
     [{Id,Pid,_,_}] = supervisor:which_children(SuperPid),
     HugeData = gb_sets:from_list(lists:seq(1, 100000)),
-    gen_server:cast(Pid, HugeData),
+    SomeData1 = list_to_atom([246]),
+    SomeData2 = list_to_atom([1024]),
+    gen_server:cast(Pid, {HugeData,SomeData1,SomeData2}),
     Ref = monitor(process, Pid),
     receive
 	{'DOWN',Ref,process,Pid,_} ->
@@ -129,6 +143,12 @@ init(_) ->
 
 handle_cast(Big, St) ->
     Seq = lists:seq(1, 10000),
+    Latin1Atom = list_to_atom([246]),
+    UnicodeAtom = list_to_atom([1024]),
+    put(Latin1Atom, Latin1Atom),
+    put(UnicodeAtom, UnicodeAtom),
+    self() ! Latin1Atom,
+    self() ! UnicodeAtom,
     self() ! Seq,
     self() ! Seq,
     self() ! Seq,