[reltool] Improve handling of unicode strings and atoms

9 files changed, 71 insertions, 63 deletions

diff --git a/lib/reltool/src/reltool.erl b/lib/reltool/src/reltool.erl
index f6ce5578bc..feb6925044 100644
--- a/lib/reltool/src/reltool.erl
+++ b/lib/reltool/src/reltool.erl
@@ -80,7 +80,7 @@ get_server(WinPid) ->
         {ok, _ServerPid} = OK ->
             OK;
         {error, Reason} ->
-            {error, lists:flatten(io_lib:format("~p", [Reason]))}
+            {error, lists:flatten(io_lib:format("~tp", [Reason]))}
     end.
 
 %% Stop a server or window process
@@ -93,7 +93,7 @@ stop(Pid) when is_pid(Pid) ->
         {'DOWN', Ref, _, _, shutdown} ->
             ok;
         {'DOWN', Ref, _, _, Reason} ->
-            {error, lists:flatten(io_lib:format("~p", [Reason]))}
+            {error, lists:flatten(io_lib:format("~tp", [Reason]))}
     end.
 
 %% Internal library function
diff --git a/lib/reltool/src/reltool.hrl b/lib/reltool/src/reltool.hrl
index 8b4898570b..9c8aae6b7e 100644
--- a/lib/reltool/src/reltool.hrl
+++ b/lib/reltool/src/reltool.hrl
@@ -119,7 +119,7 @@
                           | {archive, base_file(), [archive_opt()], [target_spec()]}
                           | {copy_file, base_file()}
                           | {copy_file, base_file(), top_file()}
-                          | {write_file, base_file(), iolist()}
+                          | {write_file, base_file(), binary()}
                           | {strip_beam_file, base_file()}.
 -type target_dir()       :: dir().
 -type incl_defaults()    :: boolean().
diff --git a/lib/reltool/src/reltool_app_win.erl b/lib/reltool/src/reltool_app_win.erl
index 468ba297bb..663144861f 100644
--- a/lib/reltool/src/reltool_app_win.erl
+++ b/lib/reltool/src/reltool_app_win.erl
@@ -174,7 +174,7 @@ loop(#state{xref_pid = Xref, common = C, app = App} = S) ->
 						    S#state.mod_wins)},
             ?MODULE:loop(S2);
         Msg ->
-            error_logger:format("~w~w got unexpected message:\n\t~p\n",
+            error_logger:format("~w~w got unexpected message:\n\t~tp\n",
                                 [?MODULE, self(), Msg]),
             ?MODULE:loop(S)
     end.
@@ -182,7 +182,7 @@ loop(#state{xref_pid = Xref, common = C, app = App} = S) ->
 exit_warning({'EXIT', _Pid, shutdown}) ->
     ok;
 exit_warning({'EXIT', _Pid, _Reason} = Msg) ->
-    error_logger:format("~w~w got unexpected message:\n\t~p\n",
+    error_logger:format("~w~w got unexpected message:\n\t~tp\n",
 			[?MODULE, self(), Msg]).
 
 create_window(#state{app = App} = S) ->
@@ -629,7 +629,7 @@ handle_event(#state{sys = Sys, app = App} = S, Wx) ->
 	    handle_mod_button(S, Items, Action);
         _ ->
             error_logger:format("~w~w got unexpected app event from "
-				"wx:\n\t~p\n",
+				"wx:\n\t~tp\n",
                                 [?MODULE, self(), Wx]),
             S
     end.
@@ -676,7 +676,7 @@ move_mod(App, {_ItemNo, ModStr}, Action) ->
 		undefined;
 	    _ ->
 		error_logger:format("~w~w got unexpected mod "
-				    "button event: ~w\n\t ~p\n",
+				    "button event: ~w\n\t ~tp\n",
 				    [?MODULE, self(), ModName, Action]),
 		M#mod.incl_cond
 	end,
diff --git a/lib/reltool/src/reltool_fgraph_win.erl b/lib/reltool/src/reltool_fgraph_win.erl
index 915330794c..a10a2281db 100644
--- a/lib/reltool/src/reltool_fgraph_win.erl
+++ b/lib/reltool/src/reltool_fgraph_win.erl
@@ -526,7 +526,7 @@ loop(S, G) ->
 	    exit(Reason);
 
         Other ->
-            error_logger:format("~w~w got unexpected message:\n\t~p\n",
+            error_logger:format("~w~w got unexpected message:\n\t~tp\n",
                                 [?MODULE, self(), Other]),
             loop(S, G)
     end.
diff --git a/lib/reltool/src/reltool_mod_win.erl b/lib/reltool/src/reltool_mod_win.erl
index 8cd63bdda1..2d56d74563 100644
--- a/lib/reltool/src/reltool_mod_win.erl
+++ b/lib/reltool/src/reltool_mod_win.erl
@@ -171,7 +171,7 @@ loop(#state{xref_pid = Xref, common = C, mod = Mod} = S) ->
 		    S2 = handle_event(S, Wx),
 		    ?MODULE:loop(S2);
 		_ ->
-		    error_logger:format("~w~w got unexpected message:\n\t~p\n",
+		    error_logger:format("~w~w got unexpected message:\n\t~tp\n",
 					[?MODULE, self(), Msg]),
 		    ?MODULE:loop(S)
 	    end
@@ -487,7 +487,7 @@ handle_event(#state{xref_pid = Xref} = S, Wx) ->
 	    S;
 	_ ->
             error_logger:format("~w~w got unexpected mod event from "
-				"wx:\n\t~p\n",
+				"wx:\n\t~tp\n",
                                 [?MODULE, self(), Wx]),
             S
     end.
@@ -667,7 +667,7 @@ goto_function(S, Editor) ->
 	    wxStyledTextCtrl:setSelection(Editor, Left2, Right2),
 	    Text = wxStyledTextCtrl:getSelectedText(Editor),
 	    S2 = add_pos_to_history(S, CurrentPos),
-	    do_goto_function(S2, string:tokens(Text, ":"));
+	    do_goto_function(S2, string:lexemes(Text, ":"));
 	_ ->
 	    %% No function call
 	    wxStyledTextCtrl:hideSelection(Editor, false),
diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl
index 89e90670cf..853191c696 100644
--- a/lib/reltool/src/reltool_server.erl
+++ b/lib/reltool/src/reltool_server.erl
@@ -225,12 +225,12 @@ parse_options([{Key, Val} | KeyVals], S, C, Sys) ->
             Sys2 = read_config(Sys, {sys, Val}),
             parse_options(KeyVals, S, C, Sys2);
         _ ->
-	    reltool_utils:throw_error("Illegal option: ~p", [{Key, Val}])
+	    reltool_utils:throw_error("Illegal option: ~tp", [{Key, Val}])
     end;
 parse_options([], S, C, Sys) ->
     S#state{common = C, sys = Sys};
 parse_options(KeyVals, _S, _C, _Sys) ->
-    reltool_utils:throw_error("Illegal option: ~p", [KeyVals]).
+    reltool_utils:throw_error("Illegal option: ~tp", [KeyVals]).
 
 loop(#state{sys = Sys} = S) ->
     receive
@@ -400,12 +400,12 @@ loop(#state{sys = Sys} = S) ->
         {'EXIT', Pid, Reason} when Pid =:= S#state.parent_pid ->
             exit(Reason);
         {call, ReplyTo, Ref, Msg} when is_pid(ReplyTo), is_reference(Ref) ->
-            error_logger:format("~w~w got unexpected call:\n\t~p\n",
+            error_logger:format("~w~w got unexpected call:\n\t~tp\n",
                                 [?MODULE, self(), Msg]),
             reltool_utils:reply(ReplyTo, Ref, {error, {invalid_call, Msg}}),
             ?MODULE:loop(S);
         Msg ->
-            error_logger:format("~w~w got unexpected message:\n\t~p\n",
+            error_logger:format("~w~w got unexpected message:\n\t~tp\n",
                                 [?MODULE, self(), Msg]),
             ?MODULE:loop(S)
     end.
@@ -1232,7 +1232,7 @@ parse_app_info(File, [{Key, Val} | KeyVals], AI, Status) ->
 			   Status);
         _ ->
 	    Status2 =
-		reltool_utils:add_warning("Unexpected item ~p in app file ~tp.",
+		reltool_utils:add_warning("Unexpected item ~tp in app file ~tp.",
 					  [Key,File],
 					  Status),
 	    parse_app_info(File, KeyVals, AI, Status2)
@@ -1417,9 +1417,12 @@ shrink_app(A) ->
 
 do_save_config(S, Filename, InclDef, InclDeriv) ->
     {ok, Config} = do_get_config(S, InclDef, InclDeriv),
-    IoList = io_lib:format("%% config generated at ~w ~w\n~p.\n\n",
-                           [date(), time(), Config]),
-    file:write_file(Filename, IoList).
+    IoList = io_lib:format("%% ~s\n"
+                           "%% config generated at ~w ~w\n"
+                           "~tp.\n\n",
+                           [epp:encoding_to_string(utf8),date(), time(), Config]),
+    Bin = unicode:characters_to_binary(IoList),
+    file:write_file(Filename, Bin).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -1455,7 +1458,7 @@ read_config(OldSys, {sys, KeyVals}) ->
 	      [NewSys2#sys.boot_rel])
     end;
 read_config(_OldSys, BadConfig) ->
-    reltool_utils:throw_error("Illegal content: ~p", [BadConfig]).
+    reltool_utils:throw_error("Illegal content: ~tp", [BadConfig]).
 
 decode(#sys{apps = Apps} = Sys, [{erts = Name, AppKeyVals} | SysKeyVals])
   when is_atom(Name), is_list(AppKeyVals) ->
@@ -1565,7 +1568,7 @@ decode(#sys{} = Sys, [{Key, Val} | KeyVals]) ->
             debug_info when Val =:= keep; Val =:= strip ->
                 Sys#sys{debug_info = Val};
             _ ->
-		reltool_utils:throw_error("Illegal option: ~p", [{Key, Val}])
+		reltool_utils:throw_error("Illegal option: ~tp", [{Key, Val}])
         end,
     decode(Sys3, KeyVals);
 decode(#app{} = App, [{Key, Val} | KeyVals]) ->
@@ -1620,14 +1623,14 @@ decode(#app{} = App, [{Key, Val} | KeyVals]) ->
 				active_dir = Dir,
 				sorted_dirs = [Dir]};
 		    false ->
-			reltool_utils:throw_error("Illegal lib dir for ~w: ~p",
+			reltool_utils:throw_error("Illegal lib dir for ~w: ~tp",
 						  [App#app.name, Val])
 		end;
 	    SelectVsn when SelectVsn=:=vsn; SelectVsn=:=lib_dir ->
 		reltool_utils:throw_error("Mutual exclusive options "
 					  "'vsn' and 'lib_dir'",[]);
             _ ->
-		reltool_utils:throw_error("Illegal option: ~p", [{Key, Val}])
+		reltool_utils:throw_error("Illegal option: ~tp", [{Key, Val}])
         end,
     decode(App2, KeyVals);
 decode(#app{mods = Mods} = App, [{mod, Name, ModKeyVals} | AppKeyVals]) ->
@@ -1641,7 +1644,7 @@ decode(#mod{} = Mod, [{Key, Val} | KeyVals]) ->
             debug_info when Val =:= keep; Val =:= strip ->
                 Mod#mod{debug_info = Val};
             _ ->
-		reltool_utils:throw_error("Illegal option: ~p", [{Key, Val}])
+		reltool_utils:throw_error("Illegal option: ~tp", [{Key, Val}])
         end,
     decode(Mod2, KeyVals);
 decode(#rel{rel_apps = RelApps} = Rel, [RelApp | KeyVals]) ->
@@ -1666,12 +1669,12 @@ decode(#rel{rel_apps = RelApps} = Rel, [RelApp | KeyVals]) ->
 	true ->
             decode(Rel#rel{rel_apps = RelApps ++ [RA]}, KeyVals);
         false ->
-	    reltool_utils:throw_error("Illegal option: ~p", [RelApp])
+	    reltool_utils:throw_error("Illegal option: ~tp", [RelApp])
     end;
 decode(Acc, []) ->
     Acc;
 decode(_Acc, KeyVal) ->
-    reltool_utils:throw_error("Illegal option: ~p", [KeyVal]).
+    reltool_utils:throw_error("Illegal option: ~tp", [KeyVal]).
 
 is_type(Type) ->
     case Type of
@@ -1866,7 +1869,7 @@ escripts_to_apps([Escript | Escripts], Apps, Status) ->
 	    {ok, AF} ->
 		AF;
 	    {error, Reason1} ->
-		reltool_utils:throw_error("Illegal escript ~tp: ~p",
+		reltool_utils:throw_error("Illegal escript ~tp: ~tp",
 					  [Escript,Reason1])
 	end,
 
@@ -1950,7 +1953,7 @@ escripts_to_apps([Escript | Escripts], Apps, Status) ->
 				      Status2),
 	    escripts_to_apps(Escripts, Apps2, Status3);
 	{error, Reason2} ->
-	    reltool_utils:throw_error("Illegal escript ~tp: ~p",
+	    reltool_utils:throw_error("Illegal escript ~tp: ~tp",
 				      [Escript,Reason2])
     end;
 escripts_to_apps([], Apps, Status) ->
@@ -2013,7 +2016,7 @@ init_escript_app(AppName, EscriptAppName, Dir, Info, Mods, Apps, Status) ->
     case lists:keymember(AppName, #app.name, Apps) of
         true ->
 	    reltool_utils:throw_error(
-	      "~w: Application name clash. Escript ~tp contains application ~tp.",
+	      "~w: Application name clash. Escript ~tp contains application ~w.",
 	      [AppName,Dir,AppName]);
         false ->
             {App2, Status}
diff --git a/lib/reltool/src/reltool_sys_win.erl b/lib/reltool/src/reltool_sys_win.erl
index ba0d90ef5f..92df270752 100644
--- a/lib/reltool/src/reltool_sys_win.erl
+++ b/lib/reltool/src/reltool_sys_win.erl
@@ -136,7 +136,7 @@ init(Options) ->
 	do_init(Options)
     catch
 	error:Reason ->
-	    io:format("~p: ~p~n",[Reason, erlang:get_stacktrace()]),
+	    io:format("~tp: ~tp~n",[Reason, erlang:get_stacktrace()]),
 	    exit({Reason, erlang:get_stacktrace()})
     end.
 
@@ -182,7 +182,7 @@ do_init([{safe_config, Safe}, {parent, Parent} | Options]) ->
     end.
 
 restart_server_safe_config(true,Parent,Reason) ->
-    io:format("~w(~w): <ERROR> ~p\n", [?MODULE, ?LINE, Reason]),
+    io:format("~w(~w): <ERROR> ~tp\n", [?MODULE, ?LINE, Reason]),
     proc_lib:init_ack(Parent, {error,Reason});
 restart_server_safe_config(false,Parent,Reason) ->
     wx:new(),
@@ -199,7 +199,7 @@ restart_server_safe_config(false,Parent,Reason) ->
 	?wxID_OK ->
 	    do_init([{safe_config,true},{parent,Parent},?safe_config]);
 	?wxID_CANCEL ->
-	    io:format("~w(~w): <ERROR> ~p\n", [?MODULE, ?LINE, Reason]),
+	    io:format("~w(~w): <ERROR> ~tp\n", [?MODULE, ?LINE, Reason]),
 	    proc_lib:init_ack(Parent,{error,Reason})
     end.
 
@@ -251,7 +251,7 @@ loop(S) ->
 				    ?MODULE:loop(S#state{warning_wins = WWs2});
 				false ->
 				    error_logger:format("~w~w got unexpected "
-							"message:\n\t~p\n",
+							"message:\n\t~tp\n",
 							[?MODULE, self(), Msg]),
 				    ?MODULE:loop(S)
 			    end
@@ -292,7 +292,7 @@ loop(S) ->
 					   S#state.app_wins),
             ?MODULE:loop(S#state{fgraph_wins = FWs, app_wins = AWs});
         Msg ->
-            error_logger:format("~w~w got unexpected message:\n\t~p\n",
+            error_logger:format("~w~w got unexpected message:\n\t~tp\n",
                                 [?MODULE, self(), Msg]),
             ?MODULE:loop(S)
     end.
@@ -316,7 +316,7 @@ handle_child_exit({'EXIT', Pid, _Reason} = Exit, FWs, AWs) ->
 msg_warning({'EXIT', _Pid, shutdown}, Type) when Type =/= unknown ->
     ok;
 msg_warning(Exit, Type) ->
-    error_logger:format("~w~w got unexpected message (~w):\n\t~p\n",
+    error_logger:format("~w~w got unexpected message (~w):\n\t~tp\n",
                         [?MODULE, self(), Type, Exit]).
 
 create_window(S) ->
@@ -1163,12 +1163,12 @@ handle_system_event(#state{sys = Sys} = S,
     do_set_sys(S#state{sys = Sys2});
 handle_system_event(S, Event, ObjRef, UserData) ->
     error_logger:format("~w~w got unexpected wx sys event to ~p "
-			"with user data: ~p\n\t ~p\n",
+			"with user data: ~tp\n\t ~tp\n",
                         [?MODULE, self(), ObjRef, UserData, Event]),
     S.
 
 handle_release_event(S, _Event, _ObjRef, UserData) ->
-    io:format("Release data: ~p\n", [UserData]),
+    io:format("Release data: ~tp\n", [UserData]),
     S.
 
 handle_source_event(S,
@@ -1225,7 +1225,7 @@ handle_app_event(S,
     handle_app_button(S, Items, Action);
 handle_app_event(S, Event, ObjRef, UserData) ->
     error_logger:format("~w~w got unexpected wx app event to "
-			"~p with user data: ~p\n\t ~p\n",
+			"~p with user data: ~tp\n\t ~tp\n",
                         [?MODULE, self(), ObjRef, UserData, Event]),
     S.
 
@@ -1269,7 +1269,7 @@ move_app(S, {_ItemNo, AppBase}, Action) ->
                 undefined;
             _ ->
                 error_logger:format("~w~w got unexpected app "
-				    "button event: ~p ~p\n",
+				    "button event: ~tp ~tp\n",
                                     [?MODULE, self(), Action, AppBase]),
                 OldApp#app.incl_cond
         end,
@@ -1543,7 +1543,7 @@ check_and_refresh(S, Status) ->
             display_message(Reason, ?wxICON_ERROR),
 	    false;
         {error, Reason} ->
-            Msg = lists:flatten(io_lib:format("Error:\n\n~p\n", [Reason])),
+            Msg = lists:flatten(io_lib:format("Error:\n\n~tp\n", [Reason])),
             display_message(Msg, ?wxICON_ERROR),
 	    false
     end,
diff --git a/lib/reltool/src/reltool_target.erl b/lib/reltool/src/reltool_target.erl
index 1615a3e9b7..1b1461178e 100644
--- a/lib/reltool/src/reltool_target.erl
+++ b/lib/reltool/src/reltool_target.erl
@@ -787,16 +787,20 @@ do_spec_rel_files(#rel{name = RelName} = Rel,  Sys) ->
     {ok, BootBin} = gen_boot(Script),
     Date = date(),
     Time = time(),
-    RelIoList = io_lib:format("%% rel generated at ~w ~w\n~p.\n\n",
+    RelIoList = io_lib:format("%% rel generated at ~w ~w\n~tp.\n\n",
                               [Date, Time, GenRel]),
-    ScriptIoList = io_lib:format("%% script generated at ~w ~w\n~p.\n\n",
+    ScriptIoList = io_lib:format("%% script generated at ~w ~w\n~tp.\n\n",
                                  [Date, Time, Script]),
     [
-     {write_file, RelFile, RelIoList},
-     {write_file, ScriptFile, ScriptIoList},
+     {write_file, RelFile, to_utf8_bin_with_enc_comment(RelIoList)},
+     {write_file, ScriptFile, to_utf8_bin_with_enc_comment(ScriptIoList)},
      {write_file, BootFile, BootBin}
     ].
 
+to_utf8_bin_with_enc_comment(IoList) when is_list(IoList) ->
+    unicode:characters_to_binary("%% " ++ epp:encoding_to_string(utf8) ++ "\n"
+                                 ++ IoList).
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Generate a complete target system
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1001,7 +1005,8 @@ spec_start_file(#sys{boot_rel = BootRelName,
     {value, Erts} = lists:keysearch(erts, #app.name, Apps),
     {value, BootRel} = lists:keysearch(BootRelName, #rel.name, Rels),
     Data = Erts#app.vsn ++ " " ++ BootRel#rel.vsn ++ "\n",
-    {BootRel#rel.vsn, {write_file, "start_erl.data", Data}}.
+    {BootRel#rel.vsn, {write_file, "start_erl.data",
+                       unicode:characters_to_binary(Data)}}.
 
 lookup_spec(Prefix, Specs) ->
     lists:filter(fun(S) -> lists:prefix(Prefix, element(2, S)) end, Specs).
@@ -1183,18 +1188,18 @@ spec_app_file(#app{name = Name,
                                                    Info#app_info.modules)],
             App2 = App#app{info = Info#app_info{modules = ModNames}},
             Contents = gen_app(App2),
-            AppIoList = io_lib:format("%% app generated at ~w ~w\n~p.\n\n",
+            AppIoList = io_lib:format("%% app generated at ~w ~w\n~tp.\n\n",
                                       [date(), time(), Contents]),
-            [{write_file, AppFilename, AppIoList}];
+            [{write_file, AppFilename, to_utf8_bin_with_enc_comment(AppIoList)}];
         all ->
             %% Include all included modules
             %% Generate new file
             ModNames = [M#mod.name || M <- Mods, M#mod.is_included],
             App2 = App#app{info = Info#app_info{modules = ModNames}},
             Contents = gen_app(App2),
-            AppIoList = io_lib:format("%% app generated at ~w ~w\n~p.\n\n",
+            AppIoList = io_lib:format("%% app generated at ~w ~w\n~tp.\n\n",
                                       [date(), time(), Contents]),
-            [{write_file, AppFilename, AppIoList}]
+            [{write_file, AppFilename, to_utf8_bin_with_enc_comment(AppIoList)}]
 
     end.
 
@@ -1285,7 +1290,7 @@ do_eval_spec({archive, Archive, Options, Files},
         {ok, _} ->
             ok;
         {error, Reason} ->
-            reltool_utils:throw_error("create archive ~ts failed: ~p",
+            reltool_utils:throw_error("create archive ~ts failed: ~tp",
 				      [ArchiveFile, Reason])
     end;
 do_eval_spec({copy_file, File}, _OrigSourceDir, SourceDir, TargetDir) ->
@@ -1299,12 +1304,12 @@ do_eval_spec({copy_file, File, OldFile},
     SourceFile = filename:join([OrigSourceDir, OldFile]),
     TargetFile = filename:join([TargetDir, File]),
     reltool_utils:copy_file(SourceFile, TargetFile);
-do_eval_spec({write_file, File, IoList},
+do_eval_spec({write_file, File, Bin},
 	     _OrigSourceDir,
 	     _SourceDir,
 	     TargetDir) ->
     TargetFile = filename:join([TargetDir, File]),
-    reltool_utils:write_file(TargetFile, IoList);
+    reltool_utils:write_file(TargetFile, Bin);
 do_eval_spec({strip_beam, File}, _OrigSourceDir, SourceDir, TargetDir) ->
     SourceFile = filename:join([SourceDir, File]),
     TargetFile = filename:join([TargetDir, File]),
@@ -1336,7 +1341,7 @@ cleanup_spec({copy_file, File}, TargetDir) ->
 cleanup_spec({copy_file, NewFile, _OldFile}, TargetDir) ->
     TargetFile = filename:join([TargetDir, NewFile]),
     file:delete(TargetFile);
-cleanup_spec({write_file, File, _IoList}, TargetDir) ->
+cleanup_spec({write_file, File, _}, TargetDir) ->
     TargetFile = filename:join([TargetDir, File]),
     file:delete(TargetFile);
 cleanup_spec({strip_beam, File}, TargetDir) ->
@@ -1406,7 +1411,7 @@ do_filter_spec(Path,
 	       ExclRegexps) ->
     Path2 = opt_join(Path, NewFile),
     match(Path2, InclRegexps, ExclRegexps);
-do_filter_spec(Path, {write_file, File, _IoList}, InclRegexps, ExclRegexps) ->
+do_filter_spec(Path, {write_file, File, _}, InclRegexps, ExclRegexps) ->
     Path2 = opt_join(Path, File),
     match(Path2, InclRegexps, ExclRegexps);
 do_filter_spec(Path, {strip_beam, File}, InclRegexps, ExclRegexps) ->
@@ -1448,7 +1453,7 @@ do_install(RelName, TargetDir) ->
     RelDir = filename:join([TargetDir2, "releases"]),
     DataFile = filename:join([RelDir, "start_erl.data"]),
     Bin = reltool_utils:read_file(DataFile),
-    case string:tokens(binary_to_list(Bin), " \n") of
+    case string:lexemes(unicode:characters_to_list(Bin), " \n") of
         [ErlVsn, RelVsn | _] ->
             ErtsBinDir = filename:join([TargetDir2, "erts-" ++ ErlVsn, "bin"]),
             BinDir = filename:join([TargetDir2, "bin"]),
@@ -1501,8 +1506,8 @@ subst_src_script(Script, SrcDir, DestDir, Vars, Opts) ->
 
 subst_file(Src, Dest, Vars, Opts) ->
     Bin = reltool_utils:read_file(Src),
-    Chars = subst(binary_to_list(Bin), Vars),
-    reltool_utils:write_file(Dest, Chars),
+    Chars = subst(unicode:characters_to_list(Bin), Vars),
+    reltool_utils:write_file(Dest, unicode:characters_to_binary(Chars)),
     case lists:member(preserve, Opts) of
         true ->
             FileInfo = reltool_utils:read_file_info(Src),
diff --git a/lib/reltool/src/reltool_utils.erl b/lib/reltool/src/reltool_utils.erl
index 60edc9f3ca..3891b5ae4d 100644
--- a/lib/reltool/src/reltool_utils.erl
+++ b/lib/reltool/src/reltool_utils.erl
@@ -55,7 +55,7 @@ root_dir() ->
     code:root_dir().
 
 erl_libs() ->
-    string:tokens(os:getenv("ERL_LIBS", ""), ":;").
+    string:lexemes(os:getenv("ERL_LIBS", ""), ":;").
 
 lib_dirs(Dir) ->
     case erl_prim_loader:list_dir(Dir) of
@@ -286,7 +286,7 @@ split_app_dir(Dir) ->
     {Name, Vsn} = split_app_name(Base),
     Vsn2 =
 	try
-	    [list_to_integer(N) || N <- string:tokens(Vsn, ".")]
+	    [list_to_integer(N) || N <- string:lexemes(Vsn, ".")]
 	catch
 	    _:_ ->
 		Vsn
@@ -427,7 +427,7 @@ scroll_size(ObjRef) ->
 safe_keysearch(Key, Pos, List, Mod, Line) ->
     case lists:keysearch(Key, Pos, List) of
         false ->
-            io:format("~w(~w): lists:keysearch(~p, ~w, ~p) -> false\n",
+            io:format("~w(~w): lists:keysearch(~tp, ~w, ~tp) -> false\n",
                       [Mod, Line, Key, Pos, List]),
             erlang:error({Mod, Line, lists, keysearch, [Key, Pos, List]});
         {value, Val} ->
@@ -498,8 +498,8 @@ read_file(File) ->
             throw_error("read file ~ts: ~ts", [File, Text])
     end.
 
-write_file(File, IoList) ->
-    case file:write_file(File, IoList) of
+write_file(File, Bin) ->
+    case file:write_file(File, Bin) of
         ok ->
 	    ok;
         {error, Reason} ->
@@ -601,7 +601,7 @@ do_decode_regexps(Key, [Regexp | Regexps], Acc) ->
 			      Regexps,
 			      [#regexp{source = Regexp, compiled = MP} | Acc]);
         _ ->
-            Text = lists:flatten(io_lib:format("~p", [{Key, Regexp}])),
+            Text = lists:flatten(io_lib:format("~tp", [{Key, Regexp}])),
             throw({error, "Illegal option: " ++ Text})
     end;
 do_decode_regexps(_Key, [], Acc) ->