[sasl] Improve handling of unicode in rb

4 files changed, 96 insertions, 162 deletions

diff --git a/lib/sasl/src/format_lib_supp.erl b/lib/sasl/src/format_lib_supp.erl
index 0b474a0232..f4bad1a3c6 100644
--- a/lib/sasl/src/format_lib_supp.erl
+++ b/lib/sasl/src/format_lib_supp.erl
@@ -25,15 +25,12 @@
 %%% tools. 
 %%% The main parts are:
 %%% 1) print_info.  Prints information tagged by 'header', 'data',
-%%%    'table', 'items' and 'newline'.
+%%%    'items' and 'newline'.
 %%%---------------------------------------------------------------------
 
 %% intermodule exports
 -export([print_info/2, print_info/3]).
 
-%% exports for use within module
--export([maxcol/2]).
-
 %%---------------------------------------------------------------------
 %% Format is an ordered list of:
 %%   {header, HeaderString}
@@ -42,10 +39,6 @@
 %%        (if possible); 'Key:     Value'.
 %%        Elements in the list may also be single terms, which are
 %%        printed as they are.
-%%   {table, {TableName, ColumnNames, Columns}}
-%%        ColumnNames is a tuple of names for the columns, and
-%%        Columns is a list, where each element is a tuple of
-%%        data for that column.
 %%   {items, {Name, Items}}
 %%        Items is a list of KeyValue_tuples. Will be printed as:
 %%        'Name:
@@ -77,9 +70,6 @@ print_format(Device, _Line, []) ->
 print_format(Device, Line, [{data, Data}|T]) ->
     print_data(Device, Line, Data),
     print_format(Device, Line, T);
-print_format(Device, Line, [{table, Table}|T]) ->
-    _ = print_table(Device, Line, Table),
-    print_format(Device, Line, T);
 print_format(Device, Line, [{items, Items}|T]) ->
     print_items(Device, Line, Items),
     print_format(Device, Line, T);
@@ -94,51 +84,49 @@ print_data(Device, Line, [{Key, Value}|T]) ->
     print_one_line(Device, Line, Key, Value),
     print_data(Device, Line, T);
 print_data(Device, Line, [Value|T]) ->
-    io:format(Device, "~p~n", [Value]),
+    Modifier = misc_supp:modifier(Device),
+    io:format(Device, "~"++Modifier++"p~n", [Value]),
     print_data(Device, Line, T).
 
+
 print_items(Device, Line, {Name, Items}) ->
     print_items(Device, Line, Name, Items).
 
-print_table(Device, Line, {TableName, ColumnNames, Columns}) ->
-    print_table(Device, Line, TableName, ColumnNames, Columns).
-
 print_newlines(_Device, 0) -> ok;
 print_newlines(Device, N) when N > 0 ->
     io:format(Device, '~n', []),
     print_newlines(Device, N-1).
 
 print_one_line(Device, Line, Key, Value) ->
-    StrKey = term_to_string(Key),
+    Modifier = misc_supp:modifier(Device),
+    StrKey = term_to_string(Key,Modifier),
     KeyLen = lists:min([length(StrKey), Line]),
     ValueLen = Line - KeyLen,
-    Format1 = lists:concat(["~-", KeyLen, s]),
-    Format2 = lists:concat(["~", ValueLen, "s~n"]),
+    Format1 = lists:concat(["~-", KeyLen, Modifier, "s"]),
+    Format2 = lists:concat(["~", ValueLen, Modifier, "s~n"]),
     io:format(Device, Format1, [StrKey]),
-    Try = term_to_string(Value),
+    Try = term_to_string(Value,Modifier),
     Length = length(Try),
     if
 	Length < ValueLen ->
 	    io:format(Device, Format2, [Try]);
 	true ->
 	    io:format(Device, "~n         ", []),
-	    Format3 = lists:concat(["~", Line, ".9p~n"]),
+	    Format3 = lists:concat(["~", Line, ".9", Modifier, "p~n"]),
 	    io:format(Device, Format3, [Value])
     end.
 
-term_to_string(Value) ->
-    lists:flatten(io_lib:format(get_format(Value), [Value])).
+term_to_string(Value,Modifier) ->
+    lists:flatten(io_lib:format(get_format(Value,Modifier), [Value])).
 
-get_format(Value) ->
-    case misc_supp:is_string(Value) of
-	true -> "~s";
-	false -> "~p"
+get_format([],_) ->
+    "~p";
+get_format(Value,Modifier) ->
+    case io_lib:printable_list(Value) of
+	true -> "~"++Modifier++"s";
+	false -> "~"++Modifier++"p"
     end.
 
-make_list(0, _Elem) -> [];
-make_list(N, Elem) -> [Elem|make_list(N-1, Elem)].
-
-
 %%-----------------------------------------------------------------
 %% Items
 %%-----------------------------------------------------------------
@@ -150,76 +138,3 @@ print_item_elements(_Device, _Line, []) -> ok;
 print_item_elements(Device, Line, [{Key, Value}|T]) ->
     print_one_line(Device, Line, lists:concat(["   ", Key]), Value),
     print_item_elements(Device, Line, T).
-
-%%-----------------------------------------------------------------
-%% Table handling
-%%-----------------------------------------------------------------
-extra_space_between_columns() -> 3.
-
-find_max_col([Row | T], ColumnSizes) ->
-    find_max_col(T, misc_supp:multi_map({format_lib_supp, maxcol},
-					[Row, ColumnSizes]));
-
-find_max_col([], ColumnSizes) -> ColumnSizes.
-
-maxcol(Term, OldMax) ->
-    lists:max([length(term_to_string(Term)), OldMax]).
-
-make_column_format(With) ->
-    lists:concat(["~", With + extra_space_between_columns(), s]).
-
-is_correct_column_length(_Length, []) -> true;
-is_correct_column_length(Length, [Tuple|T]) ->
-    case size(Tuple) of
-	Length -> is_correct_column_length(Length, T);
-	_ -> false
-    end;
-is_correct_column_length(_, _) -> false.
-
-print_table(Device, Line, TableName, _TupleOfColumnNames, []) ->
-    print_one_line(Device, Line, TableName, "<empty table>"),
-    io:format(Device, "~n", []);
-
-print_table(Device, Line, TableName, TupleOfColumnNames, ListOfTuples) 
-                when is_list(ListOfTuples), is_tuple(TupleOfColumnNames) ->
-    case is_correct_column_length(size(TupleOfColumnNames),
-				  ListOfTuples) of
-	true -> 
-	    print_one_line(Device, Line, TableName, " "),
-	    ListOfColumnNames = tuple_to_list(TupleOfColumnNames),
-	    ListOfLists = lists:map(fun(Tuple) ->
-					    tuple_to_list(Tuple)
-				    end,
-				    ListOfTuples),
-	    ColWidths = find_max_col([ListOfColumnNames |
-				      ListOfLists],
-				     make_list(length(ListOfColumnNames),0)),
-	    Format = lists:flatten([lists:map(fun(CW) ->
-						      make_column_format(CW)
-					      end,
-					      ColWidths), "~n"]),
-	    io:format(Device, Format, ListOfColumnNames),
-	    io:format(Device,
-		      lists:concat(['~', extra_space_between_columns(),
-				    'c', '~', lists:sum(ColWidths)
-				    + (length(ColWidths) - 1)
-				    * extra_space_between_columns(),
-				    'c~n']), [$ , $-]),
-	    lists:foreach(fun(List) ->
-				  print_row(List, Device, Format)
-			  end,
-			  ListOfLists),
-	    io:format(Device, '~n', []),
-	    true;
-	false ->
-	    {error, {'a tuple has wrong size',
-		     {TableName, TupleOfColumnNames, ListOfTuples}}}
-    end.
-
-%%--------------------------------------------------
-%% Device MUST be 2nd arg because of extraarg ni foreach...
-%%--------------------------------------------------
-print_row(Row, Device, Format) ->
-    io:format(Device, Format,
-	      lists:map(fun(Term) -> term_to_string(Term) end,
-			Row)).
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".
diff --git a/lib/sasl/src/rb.erl b/lib/sasl/src/rb.erl
index 79df150b41..29091c0586 100644
--- a/lib/sasl/src/rb.erl
+++ b/lib/sasl/src/rb.erl
@@ -273,7 +273,7 @@ code_change(_OldVsn, State, _Extra) ->
 open_log_file(standard_io) -> standard_io;
 open_log_file(Fd) when is_atom(Fd),Fd=/=standard_error -> 
     case whereis(Fd) of
-	undefined -> io:format("rb: Registered name not found '~s'.~n",
+	undefined -> io:format("rb: Registered name not found '~ts'.~n",
 		      [Fd]),
 	             io:format("rb: Using standard_io~n"),
                      open_log_file(standard_io);
@@ -281,10 +281,10 @@ open_log_file(Fd) when is_atom(Fd),Fd=/=standard_error ->
     end;
 open_log_file(Fd) when is_pid(Fd)-> Fd;
 open_log_file(FileName) when is_list(FileName) ->
-    case file:open(FileName, [write,append]) of
+    case file:open(FileName, [write,append,{encoding,utf8}]) of
 	{ok, Fd} -> Fd;
 	Error -> 
-	    io:format("rb: Cannot open file '~s' (~w).~n",
+	    io:format("rb: Cannot open file '~ts' (~w).~n",
 		      [FileName, Error]),
 	    io:format("rb: Using standard_io~n"),
 	    standard_io
@@ -419,8 +419,8 @@ read_reports(No, Fd, Fname, Max, Type) ->
 	    add_report_data(NewRes, No, Fname);
 	{error, [Problem | Res]} ->
 	    _ = file:close(Fd),
-	    io:format("Error: ~p~n",[Problem]),
-	    io:format("Salvaged ~p entries from corrupt report file ~s...~n",
+	    io:format("Error: ~tp~n",[Problem]),
+	    io:format("Salvaged ~p entries from corrupt report file ~ts...~n",
 		      [length(Res),Fname]),
 	    NewRes = 
 		if
@@ -431,7 +431,7 @@ read_reports(No, Fd, Fname, Max, Type) ->
 		end,
 	    add_report_data(NewRes, No, Fname);
 	Else ->
-	    io:format("err ~p~n", [Else]),
+	    io:format("err ~tp~n", [Else]),
 	    [{No, unknown, "Can't read reports from file " ++ Fname,
 		  "???", Fname, 0}]
     end.
@@ -530,21 +530,18 @@ get_short_descr({{Date, Time}, {error_report, Pid, {_, crash_report, Rep}}}) ->
 	    {value, {_Key, N}} -> N;
 	    _ -> Pid
 	end,
-    NameStr = lists:flatten(io_lib:format("~w", [Name])),
-    {NameStr, date_str(Date, Time)};
+    {Name, date_str(Date, Time)};
 get_short_descr({{Date, Time}, {error_report, Pid, {_, supervisor_report,Rep}}}) ->
     Name =
 	case lists:keysearch(supervisor, 1, Rep) of
 	    {value, {_Key, N}} when is_atom(N) -> N;
 	    _ -> Pid
 	end,
-    NameStr = lists:flatten(io_lib:format("~w", [Name])),
-    {NameStr, date_str(Date,Time)};
+    {Name, date_str(Date,Time)};
 get_short_descr({{Date, Time}, {_Type, Pid, _}}) ->
-    NameStr = lists:flatten(io_lib:format("~w", [Pid])),
-    {NameStr, date_str(Date,Time)};
+    {Pid, date_str(Date,Time)};
 get_short_descr(_) ->
-    {"???", "???"}.
+    {'???', "???"}.
     
 date_str({Y,Mo,D}=Date,{H,Mi,S}=Time) ->
     case application:get_env(sasl,utc_log) of 
@@ -571,53 +568,57 @@ local_time_to_universal_time({Date,Time}) ->
     end.
 
 
-print_list(Fd, Data, Type) ->
+print_list(Fd, Data0, Type) ->
+    Modifier = misc_supp:modifier(Fd),
     Header = {"No", "Type", "Process", "Date     Time"},
-    Width = find_width([Header | Data], 0)+1,
-    DateWidth = find_date_width([Header | Data], 0) +1,
-    Format = lists:concat(["~4s~20s ~", Width, "s~20s~n"]),
+    {DescrWidth,DateWidth,Data} = find_widths(Data0, Modifier, 7, 13, []),
+    Format = lists:concat(["~4s~20s ~", DescrWidth, "s~20s~n"]),
     io:format(Fd, Format, tuple_to_list(Header)),
     io:format(Fd, Format, ["==", "====", "=======", "====     ===="]),
-    print_list(Fd, Data, Type, Width, DateWidth).
-print_list(_, [], _, _, _) -> true;
-print_list(Fd, [H|T], Type, Width, DateWidth) ->
-    print_one_report(Fd, H, Type, Width, DateWidth),
-    print_list(Fd, T, Type, Width, DateWidth).
-
-find_width([], Width) -> Width;
-find_width([H|T], Width) ->
-    Try = length(element(3, H)),
-    if
-	Try > Width -> find_width(T, Try);
-	true -> find_width(T, Width)
-    end.
-find_date_width([], Width) -> Width;
-find_date_width([H|T], Width) ->
-    Try = length(element(4, H)),
-    if
-	Try > Width -> find_date_width(T, Try);
-	true -> find_date_width(T, Width)
-    end.
+    print_list(Fd, Data, Type, DescrWidth, DateWidth, Modifier).
+print_list(_, [], _, _, _, _) -> true;
+print_list(Fd, [H|T], Type, Width, DateWidth, Modifier) ->
+    print_one_report(Fd, H, Type, Width, DateWidth, Modifier),
+    print_list(Fd, T, Type, Width, DateWidth, Modifier).
+
+
+find_widths([], _Modifier, DescrWidth, DateWidth, Data) ->
+    {DescrWidth+1, DateWidth+1, lists:reverse(Data)};
+find_widths([H|T], Modifier, DescrWidth, DateWidth, Data) ->
+    DescrTerm = element(3,H),
+    Descr = lists:flatten(io_lib:format("~"++Modifier++"w", [DescrTerm])),
+    DescrTry = length(Descr),
+    NewDescrWidth =
+        if
+            DescrTry > DescrWidth -> DescrTry;
+            true -> DescrWidth
+        end,
+    DateTry = length(element(4, H)),
+    NewDateWitdh =
+        if
+            DateTry > DateWidth -> DateTry;
+            true -> DateWidth
+        end,
+    NewH = setelement(3,H,Descr),
+    find_widths(T, Modifier, NewDescrWidth, NewDateWitdh, [NewH|Data]).
 
 print_one_report(Fd, {No, RealType, ShortDescr, Date, _Fname, _FilePos},
 		 WantedType,
-		 Width, DateWidth) ->
+		 Width, DateWidth, Modifier) ->
     if
 	WantedType == all ->
 	    print_short_descr(Fd, No, RealType, ShortDescr, Date, Width, 
-			      DateWidth);
+			      DateWidth, Modifier);
 	WantedType == RealType ->
 	    print_short_descr(Fd, No, RealType, ShortDescr, Date, Width, 
-			      DateWidth);
+			      DateWidth, Modifier);
 	true -> ok
     end.
 
-print_short_descr(Fd, No, Type, ShortDescr, Date, Width, DateWidth) ->
-    Format = lists:concat(["~4w~20w ~", Width, "s~", DateWidth,"s~n"]),
-    io:format(Fd, Format, [No,
-		       Type, 
-		       io_lib:format("~s", [ShortDescr]),
-		       Date]).
+print_short_descr(Fd, No, Type, ShortDescr, Date, Width, DateWidth, Modifier) ->
+    Format = lists:concat(["~4w~20", Modifier, "w ~", Width, Modifier, "s~",
+                           DateWidth, "s~n"]),
+    io:format(Fd, Format, [No, Type,  ShortDescr, Date]).
 
 print_report_by_num(Dir, Data, Number, Device, Abort, Log) ->
     {_,Device1} = print_report(Dir, Data, Number, Device, Abort, Log),
@@ -658,7 +659,7 @@ print_report(Dir, Data, Number, Device, Abort, Log) ->
 		{ok, Fd} -> 
 		    read_rep(Fd, FilePosition, Device, Abort, Log);
 		_ -> 
-		    io:format("rb: can't open file ~p~n", [Fname]),
+		    io:format("rb: can't open file ~tp~n", [Fname]),
 		    {proceed,Device}
 	    end;
 	no_report ->
@@ -691,14 +692,14 @@ print_grep_report(Dir, Data, Number, Device, RegExp, Abort, Log) ->
 	{ok, Fd} when is_pid(Fd) -> 
 	    check_rep(Fd, FilePosition, Device, RegExp, Number, Abort, Log);
 	_ -> 
-	    io:format("rb: can't open file ~p~n", [Fname]),
+	    io:format("rb: can't open file ~tp~n", [Fname]),
 	    {proceed,Device}
     end.
 
 check_rep(Fd, FilePosition, Device, RegExp, Number, Abort, Log) ->
     case read_rep_msg(Fd, FilePosition) of
 	{Date, Msg} ->
-	    MsgStr = lists:flatten(io_lib:format("~p",[Msg])),
+	    MsgStr = lists:flatten(io_lib:format("~tp",[Msg])),
 	    case run_re(MsgStr, RegExp) of
 		match ->
 		    io:format("Found match in report number ~w~n", [Number]),
@@ -722,7 +723,7 @@ run_re(Subject, Regexp) ->
     run_re(Subject, Regexp, []).
 
 run_re(Subject, Regexp, Options) ->
-    case re:run(Subject, Regexp, Options) of
+    case re:run(Subject, Regexp, [unicode|Options--[unicode]]) of
         nomatch ->
             nomatch;
 	_ ->
@@ -748,7 +749,7 @@ filter_report(Dir, Data, Filters, Number, Device, Abort, Log) ->
 		{ok, Fd} ->
 		    filter_rep(Filters, Fd, FilePosition, Device, Abort, Log);
 		_ ->
-		    io:format("rb: can't open file ~p~n", [Fname]),
+		    io:format("rb: can't open file ~tp~n", [Fname]),
 		    {proceed,Device}
 	    end;
 	no_report ->
@@ -800,7 +801,7 @@ filter_report([{Key, RegExp, re}|T], Msg) ->
 	undefined ->
 	    false;
 	Value ->
-	    Subject = lists:flatten(io_lib:format("~p",[Value])),
+	    Subject = lists:flatten(io_lib:format("~tp",[Value])),
 	    case run_re(Subject, RegExp) of
 		match ->
 		    filter_report(T, Msg);
@@ -812,7 +813,7 @@ filter_report([{Key, RegExp, re, no}|T], Msg) ->
 	undefined ->
 	    true;
 	Value ->
-	    Subject = lists:flatten(io_lib:format("~p",[Value])),
+	    Subject = lists:flatten(io_lib:format("~tp",[Value])),
 	    case run_re(Subject, RegExp) of
 		match -> false;
 		_ -> filter_report(T, Msg)
@@ -890,7 +891,7 @@ read_rep(Fd, FilePosition, Device, Abort, Log) ->
 handle_bad_form(Date, Msg, Device, Abort, Log) ->
     io:format("rb: ERROR! A report on bad form was encountered. " ++
 	      "It can not be printed to the log.~n~n"),
-    io:format("Details:~n~p ~p~n~n", [Date,Msg]),
+    io:format("Details:~n~p ~tp~n~n", [Date,Msg]),
     case {Abort,Device,open_log_file(Log)} of
 	{true,standard_io,standard_io} ->
 	    io:format("rb: Logging aborted.~n"),
@@ -899,7 +900,7 @@ handle_bad_form(Date, Msg, Device, Abort, Log) ->
 	    io:format("rb: Logging resumed...~n~n"),
 	    {proceed,Device};
 	{_,_,standard_io} ->
-	    io:format("rb: Can not reopen ~p. Logging aborted.~n", [Log]),
+	    io:format("rb: Can not reopen ~tp. Logging aborted.~n", [Log]),
 	    {abort,Device};
 	{true,_,NewDevice} ->
 	    io:format(NewDevice,
diff --git a/lib/sasl/src/rb_format_supp.erl b/lib/sasl/src/rb_format_supp.erl
index 0004d85af4..c0e517164a 100644
--- a/lib/sasl/src/rb_format_supp.erl
+++ b/lib/sasl/src/rb_format_supp.erl
@@ -94,13 +94,15 @@ print(Date, Report, Device) ->
 					       [{header, Header}]),
 		    io:format(Device, Format, Args);
 		{Type, _GL, TypeReport} ->
-		    io:format(Device, "~nInfo type <~w> ~s~n",
+                    Modifier = misc_supp:modifier(Device),
+		    io:format(Device, "~nInfo type <~"++Modifier++"w> ~s~n",
 			      [Type, Date]),
-		    io:format(Device, "~p", [TypeReport]);
+		    io:format(Device, "~"++Modifier++"p", [TypeReport]);
 		_ -> 
+                    Modifier = misc_supp:modifier(Device),
 		    io:format("~nPrinting info of unknown type... ~s~n",
 			      [Date]),
-		    io:format(Device, "~p", [Report])
+		    io:format(Device, "~"++Modifier++"p", [Report])
 %	    end
     end.