Make adjustments for Unicode

14 files changed, 118 insertions, 78 deletions

diff --git a/lib/kernel/src/application_controller.erl b/lib/kernel/src/application_controller.erl
index 75ce852001..3c860af48e 100644
--- a/lib/kernel/src/application_controller.erl
+++ b/lib/kernel/src/application_controller.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -247,7 +247,7 @@ start_boot_application(Application, RestartType) ->
 	{{error, {already_loaded, AppName}}, _} ->
 	    gen_server:call(?AC, {start_application, AppName, RestartType}, infinity);
 	{{error,{bad_environment_value,Env}}, permanent} ->
-	    Txt = io_lib:format("Bad environment variable: ~p  Application: ~p",
+	    Txt = io_lib:format("Bad environment variable: ~tp  Application: ~p",
 				[Env, Application]),
 	    exit({error, list_to_atom(lists:flatten(Txt))});
 	{Error, _} ->
@@ -501,13 +501,13 @@ init(Init, Kernel) ->
 						  {local, ?AC})
 		    end;
 		{error, ErrorStr} ->
-		    Str = lists:flatten(io_lib:format("invalid config data: ~s", [ErrorStr])),
+		    Str = lists:flatten(io_lib:format("invalid config data: ~ts", [ErrorStr])),
 		    Init ! {ack, self(), {error, to_string(Str)}}
 	    end;
 	{error, {File, Line, Str}} ->
 	    ReasonStr =
 		lists:flatten(io_lib:format("error in config file "
-					    "~p (~w): ~s",
+					    "~tp (~w): ~ts",
 					    [File, Line, Str])),
 	    Init ! {ack, self(), {error, to_string(ReasonStr)}}
     end.
@@ -537,17 +537,17 @@ check_conf_data(ConfData) when is_list(ConfData) ->
 	    end;
 	{AppName, List} when is_list(List)  ->
 	    ErrMsg = "application: "
-		++ lists:flatten(io_lib:format("~p",[AppName]))
+		++ lists:flatten(io_lib:format("~tp",[AppName]))
 		++ "; application name must be an atom",
 	    {error, ErrMsg};
 	{AppName, _List} ->
 	    ErrMsg = "application: "
-		++ lists:flatten(io_lib:format("~p",[AppName]))
+		++ lists:flatten(io_lib:format("~tp",[AppName]))
 		++ "; parameters must be a list",
 	    {error, ErrMsg};
 	Else ->
 	    ErrMsg = "invalid application name: " ++ 
-		lists:flatten(io_lib:format(" ~p",[Else])),
+		lists:flatten(io_lib:format(" ~tp",[Else])),
 	    {error, ErrMsg}
     end;
 check_conf_data(_ConfData) ->
@@ -570,10 +570,10 @@ check_para_kernel([{Para, _Val} | ParaList]) when is_atom(Para) ->
     check_para_kernel(ParaList);
 check_para_kernel([{Para, _Val} | _ParaList]) ->
     {error, "application: kernel; invalid parameter: " ++ 
-     lists:flatten(io_lib:format("~p",[Para]))};
+     lists:flatten(io_lib:format("~tp",[Para]))};
 check_para_kernel(Else) ->
     {error, "application: kernel; invalid parameter list: " ++ 
-     lists:flatten(io_lib:format("~p",[Else]))}.
+     lists:flatten(io_lib:format("~tp",[Else]))}.
     
 
 check_distributed([]) ->
@@ -594,10 +594,10 @@ check_para([{Para, _Val} | ParaList], AppName) when is_atom(Para) ->
     check_para(ParaList, AppName);
 check_para([{Para, _Val} | _ParaList], AppName) ->
     {error, "application: " ++ AppName ++ "; invalid parameter: " ++ 
-     lists:flatten(io_lib:format("~p",[Para]))};
+     lists:flatten(io_lib:format("~tp",[Para]))};
 check_para([Else | _ParaList], AppName) ->
     {error, "application: " ++ AppName ++ "; invalid parameter: " ++ 
-     lists:flatten(io_lib:format("~p",[Else]))}.
+     lists:flatten(io_lib:format("~tp",[Else]))}.
 
 
 -type calls() :: 'info' | 'prep_config_change' | 'which_applications'
@@ -1434,7 +1434,9 @@ make_appl(Name) when is_atom(Name) ->
 		{ok, [Application]} ->
 		    {ok, make_appl_i(Application)};
 		{error, Reason} -> 
-		    {error, {file:format_error(Reason), FName}}
+		    {error, {file:format_error(Reason), FName}};
+                error ->
+                    {error, "bad encoding"}
 	    end
     end;
 make_appl(Application) ->
@@ -1443,12 +1445,17 @@ make_appl(Application) ->
 prim_consult(FullName) ->
     case erl_prim_loader:get_file(FullName) of
 	{ok, Bin, _} ->
-	    case erl_scan:string(binary_to_list(Bin)) of
-		{ok, Tokens, _EndLine} ->
-		    prim_parse(Tokens, []);
-		{error, Reason, _EndLine} ->
-		    {error, Reason}
-	    end;
+            case file_binary_to_list(Bin) of
+                {ok, String} ->
+                    case erl_scan:string(String, 1, [unicode]) of
+                        {ok, Tokens, _EndLine} ->
+                            prim_parse(Tokens, []);
+                        {error, Reason, _EndLine} ->
+                            {error, Reason}
+                    end;
+                error ->
+                    error
+            end;
 	error ->
 	    {error, enoent}
     end.
@@ -1521,7 +1528,7 @@ do_change_apps(Applications, Config, OldAppls) ->
     %% Report errors, but do not terminate
     %% (backwards compatible behaviour)
     lists:foreach(fun({error, {SysFName, Line, Str}}) ->
-			  Str2 = lists:flatten(io_lib:format("~p: ~w: ~s~n",
+			  Str2 = lists:flatten(io_lib:format("~tp: ~w: ~ts~n",
 							     [SysFName, Line, Str])),
 			  error_logger:format(Str2, [])
 		  end,
@@ -1593,18 +1600,18 @@ conv(_) -> [].
 
 %%% Fix some day: eliminate the duplicated code here
 make_term(Str) -> 
-    case erl_scan:string(Str) of
+    case erl_scan:string(Str, 1, [unicode]) of
 	{ok, Tokens, _} ->		  
 	    case erl_parse:parse_term(Tokens ++ [{dot, 1}]) of
 		{ok, Term} ->
 		    Term;
 		{error, {_,M,Reason}} ->
-		    error_logger:format("application_controller: ~s: ~s~n",
+		    error_logger:format("application_controller: ~ts: ~ts~n",
 					[M:format_error(Reason), Str]),
 		    throw({error, {bad_environment_value, Str}})
 	    end;
 	{error, {_,M,Reason}, _} ->
-	    error_logger:format("application_controller: ~s: ~s~n",
+	    error_logger:format("application_controller: ~ts: ~ts~n",
 				[M:format_error(Reason), Str]),
 	    throw({error, {bad_environment_value, Str}})
     end.
@@ -1828,8 +1835,12 @@ load_file(File) ->
 	{ok, Bin, _FileName} ->
 	    %% Make sure that there is some whitespace at the end of the string
 	    %% (so that reading a file with no NL following the "." will work).
-	    Str = binary_to_list(Bin) ++ " ",
-	    scan_file(Str);
+            case file_binary_to_list(Bin) of
+                {ok, String} ->
+                    scan_file(String ++ " ");
+                error ->
+                    {error, {none, scan_file, "bad encoding"}}
+            end;
 	error ->
 	    {error, {none, open_file, "configuration file not found"}}
     end.
@@ -1947,6 +1958,18 @@ test_make_apps([], Res) ->
 test_make_apps([A|Apps], Res) ->
     test_make_apps(Apps, [make_appl(A) | Res]).
 
+file_binary_to_list(Bin) ->
+    Enc = case epp:read_encoding_from_binary(Bin) of
+              none -> epp:default_encoding();
+              Encoding -> Encoding
+          end,
+    case catch unicode:characters_to_list(Bin, Enc) of
+        String when is_list(String) ->
+            {ok, String};
+        _ ->
+            error
+    end.
+
 %%-----------------------------------------------------------------
 %% String conversion
 %% Exit reason needs to be a printable string
diff --git a/lib/kernel/src/auth.erl b/lib/kernel/src/auth.erl
index 6ae786ebd9..165a0f0dc0 100644
--- a/lib/kernel/src/auth.erl
+++ b/lib/kernel/src/auth.erl
@@ -384,7 +384,7 @@ create_cookie(Name) ->
 		{{error,Reason}, _} ->
 		    {error,
 		     lists:flatten(
-		       io_lib:format("Failed to write to cookie file '~s': ~p", [Name, Reason]))};
+		       io_lib:format("Failed to write to cookie file '~ts': ~p", [Name, Reason]))};
 		{ok, {error, Reason}} ->
 		    {error, "Failed to change mode: " ++ atom_to_list(Reason)}
 	    end;
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
index 361f2bdf8a..2908b747d1 100644
--- a/lib/kernel/src/code.erl
+++ b/lib/kernel/src/code.erl
@@ -511,7 +511,7 @@ search([{Dir, File} | Tail]) ->
 	false -> 
 	    search(Tail);
 	{Dir2, File} ->
-	    io:format("** ~s hides ~s~n",
+	    io:format("** ~ts hides ~ts~n",
 		      [filename:join(Dir, File),
 		       filename:join(Dir2, File)]),
 	    [clash | search(Tail)]
@@ -528,7 +528,7 @@ decorate([File|Tail], Dir) ->
     [{Dir, File} | decorate(Tail, Dir)].
 
 filter(_Ext, Dir, error) ->
-    io:format("** Bad path can't read ~s~n", [Dir]), [];
+    io:format("** Bad path can't read ~ts~n", [Dir]), [];
 filter(Ext, _, {ok,Files}) -> 
     filter2(Ext, length(Ext), Files).
 
diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
index b2d2c19f78..2de175d5db 100644
--- a/lib/kernel/src/code_server.erl
+++ b/lib/kernel/src/code_server.erl
@@ -1266,11 +1266,11 @@ try_load_module_1(File, Mod, Bin, Caller, #state{moddb=Db}=St) ->
 			{error,on_load} ->
 			    handle_on_load(Mod, File, Caller, St);
 			{error,What} = Error ->
-			    error_msg("Loading of ~s failed: ~p\n", [File, What]),
+			    error_msg("Loading of ~ts failed: ~p\n", [File, What]),
 			    {reply,Error,St}
 		    end;
 		Error ->
-		    error_msg("Native loading of ~s failed: ~p\n",
+		    error_msg("Native loading of ~ts failed: ~p\n",
 			      [File,Error]),
 		    {reply,ok,St}
 	    end
diff --git a/lib/kernel/src/disk_log.erl b/lib/kernel/src/disk_log.erl
index 1513fdaec0..9483640a30 100644
--- a/lib/kernel/src/disk_log.erl
+++ b/lib/kernel/src/disk_log.erl
@@ -1527,48 +1527,48 @@ do_format_error({size_mismatch, OldSize, ArgSize}) ->
     io_lib:format("The given size ~p does not match the size ~p found on "
 		  "the disk log size file~n", [ArgSize, OldSize]);
 do_format_error({read_only_mode, Log}) ->
-    io_lib:format("The disk log ~p has been opened read-only, but the "
+    io_lib:format("The disk log ~tp has been opened read-only, but the "
 		  "requested operation needs read-write access~n", [Log]);
 do_format_error({format_external, Log}) ->
     io_lib:format("The requested operation can only be applied on internally "
-		  "formatted disk logs, but ~p is externally formatted~n",
+		  "formatted disk logs, but ~tp is externally formatted~n",
 		  [Log]);
 do_format_error({blocked_log, Log}) ->
-    io_lib:format("The blocked disk log ~p does not queue requests, or "
+    io_lib:format("The blocked disk log ~tp does not queue requests, or "
 		  "the log has been blocked by the calling process~n", [Log]);
 do_format_error({full, Log}) ->
-    io_lib:format("The halt log ~p is full~n", [Log]);
+    io_lib:format("The halt log ~tp is full~n", [Log]);
 do_format_error({not_blocked, Log}) ->
-    io_lib:format("The disk log ~p is not blocked~n", [Log]);
+    io_lib:format("The disk log ~tp is not blocked~n", [Log]);
 do_format_error({not_owner, Pid}) ->
-    io_lib:format("The pid ~p is not an owner of the disk log~n", [Pid]);
+    io_lib:format("The pid ~tp is not an owner of the disk log~n", [Pid]);
 do_format_error({not_blocked_by_pid, Log}) ->
-    io_lib:format("The disk log ~p is blocked, but only the blocking pid "
+    io_lib:format("The disk log ~tp is blocked, but only the blocking pid "
 		  "can unblock a disk log~n", [Log]);
 do_format_error({new_size_too_small, Log, CurrentSize}) ->
-    io_lib:format("The current size ~p of the halt log ~p is greater than the "
+    io_lib:format("The current size ~p of the halt log ~tp is greater than the "
 		  "requested new size~n", [CurrentSize, Log]);
 do_format_error({halt_log, Log}) ->
-    io_lib:format("The halt log ~p cannot be wrapped~n", [Log]);
+    io_lib:format("The halt log ~tp cannot be wrapped~n", [Log]);
 do_format_error({same_file_name, Log}) ->
-    io_lib:format("Current and new file name of the disk log ~p "
+    io_lib:format("Current and new file name of the disk log ~tp "
 		  "are the same~n", [Log]);
 do_format_error({arg_mismatch, Option, FirstValue, ArgValue}) ->
-    io_lib:format("The value ~p of the disk log option ~p does not match "
-		  "the current value ~p~n", [ArgValue, Option, FirstValue]);
+    io_lib:format("The value ~tp of the disk log option ~p does not match "
+		  "the current value ~tp~n", [ArgValue, Option, FirstValue]);
 do_format_error({name_already_open, Log}) ->
-    io_lib:format("The disk log ~p has already opened another file~n", [Log]);
+    io_lib:format("The disk log ~tp has already opened another file~n", [Log]);
 do_format_error({node_already_open, Log}) ->
-    io_lib:format("The distribution option of the disk log ~p does not match "
+    io_lib:format("The distribution option of the disk log ~tp does not match "
 		  "already open log~n", [Log]);
 do_format_error({open_read_write, Log}) ->
-    io_lib:format("The disk log ~p has already been opened read-write~n", 
+    io_lib:format("The disk log ~tp has already been opened read-write~n", 
 		  [Log]);
 do_format_error({open_read_only, Log}) ->
-    io_lib:format("The disk log ~p has already been opened read-only~n", 
+    io_lib:format("The disk log ~tp has already been opened read-only~n", 
 		  [Log]);
 do_format_error({not_internal_wrap, Log}) ->
-    io_lib:format("The requested operation cannot be applied since ~p is not "
+    io_lib:format("The requested operation cannot be applied since ~tp is not "
 		  "an internally formatted disk log~n", [Log]);
 do_format_error(no_such_log) ->
     io_lib:format("There is no disk log with the given name~n", []);
@@ -1579,13 +1579,13 @@ do_format_error(nodedown) ->
     io_lib:format("There seems to be no node up that can handle "
 		  "the request~n", []);
 do_format_error({corrupt_log_file, FileName}) ->
-    io_lib:format("The disk log file \"~s\" contains corrupt data~n", 
+    io_lib:format("The disk log file \"~ts\" contains corrupt data~n", 
                   [FileName]);
 do_format_error({need_repair, FileName}) ->
-    io_lib:format("The disk log file \"~s\" has not been closed properly and "
+    io_lib:format("The disk log file \"~ts\" has not been closed properly and "
 		  "needs repair~n", [FileName]);
 do_format_error({not_a_log_file, FileName}) ->
-    io_lib:format("The file \"~s\" is not a wrap log file~n", [FileName]);
+    io_lib:format("The file \"~ts\" is not a wrap log file~n", [FileName]);
 do_format_error({invalid_header, InvalidHeader}) ->
     io_lib:format("The disk log header is not wellformed: ~p~n", 
 		  [InvalidHeader]);
@@ -1593,14 +1593,14 @@ do_format_error(end_of_log) ->
     io_lib:format("An attempt was made to step outside a not yet "
 		  "full wrap log~n", []);
 do_format_error({invalid_index_file, FileName}) ->
-    io_lib:format("The wrap log index file \"~s\" cannot be used~n",
+    io_lib:format("The wrap log index file \"~ts\" cannot be used~n",
 		  [FileName]);
 do_format_error({no_continuation, BadCont}) ->
     io_lib:format("The term ~p is not a chunk continuation~n", [BadCont]);
 do_format_error({file_error, FileName, Reason}) ->
-    io_lib:format("\"~s\": ~p~n", [FileName, file:format_error(Reason)]);
+    io_lib:format("\"~ts\": ~tp~n", [FileName, file:format_error(Reason)]);
 do_format_error(E) ->
-    io_lib:format("~p~n", [E]).
+    io_lib:format("~tp~n", [E]).
 
 do_info(L, Cnt) ->
     #log{name = Name, type = Type, mode = Mode, filename = File, 
diff --git a/lib/kernel/src/disk_log_1.erl b/lib/kernel/src/disk_log_1.erl
index 0cb1ed579a..cbf7e1c085 100644
--- a/lib/kernel/src/disk_log_1.erl
+++ b/lib/kernel/src/disk_log_1.erl
@@ -489,7 +489,7 @@ lh(H, _F) -> % cannot happen
 
 repair(In, File) ->
     FSz = file_size(File),
-    error_logger:info_msg("disk_log: repairing ~p ...\n", [File]),
+    error_logger:info_msg("disk_log: repairing ~tp ...\n", [File]),
     Tmp = add_ext(File, "TMP"),
     {ok, {_Alloc, Out, {0, _}, _FileSize}} = new_int_file(Tmp, none),
     scan_f_read(<<>>, In, Out, File, FSz, Tmp, ?MAX_CHUNK_SIZE, 0, 0).
@@ -758,7 +758,7 @@ mf_int_chunk(Handle, {FileNo, Pos}, Bin, N) ->
     NFileNo = inc(FileNo, Handle#handle.maxF),
     case catch int_open(FName, true, read_only, any) of
 	{error, _Reason} ->
-	   error_logger:info_msg("disk_log: chunk error. File ~p missing.\n\n",
+	   error_logger:info_msg("disk_log: chunk error. File ~tp missing.\n\n",
 				 [FName]),
 	    mf_int_chunk(Handle, {NFileNo, 0}, [], N);
 	{ok, {_Alloc, FdC, _HeadSize, _FileSize}} ->
@@ -786,7 +786,7 @@ mf_int_chunk_read_only(Handle, {FileNo, Pos}, Bin, N) ->
     NFileNo = inc(FileNo, Handle#handle.maxF),
     case catch int_open(FName, true, read_only, any) of
 	{error, _Reason} ->
-	   error_logger:info_msg("disk_log: chunk error. File ~p missing.\n\n",
+	   error_logger:info_msg("disk_log: chunk error. File ~tp missing.\n\n",
 				 [FName]),
 	   mf_int_chunk_read_only(Handle, {NFileNo, 0}, [], N);
 	{ok, {_Alloc, FdC, _HeadSize, _FileSize}} ->
diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl
index 16f2dde464..70c4583ad2 100644
--- a/lib/kernel/src/file.erl
+++ b/lib/kernel/src/file.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -148,7 +148,7 @@ format_error({Line, ?MODULE, {Reason, Stacktrace}}) ->
     io_lib:format("~w: evaluation failed with reason ~w and stacktrace ~w", 
                   [Line, Reason, Stacktrace]);
 format_error({Line, Mod, Reason}) ->
-    io_lib:format("~w: ~s", [Line, Mod:format_error(Reason)]);
+    io_lib:format("~w: ~ts", [Line, Mod:format_error(Reason)]);
 format_error(badarg) ->
     "bad argument";
 format_error(system_limit) ->
@@ -591,7 +591,7 @@ pread(_, _, _) ->
 write(File, Bytes) when (is_pid(File) orelse is_atom(File)) ->
     case make_binary(Bytes) of
 	Bin when is_binary(Bin) ->
-	    io:request(File, {put_chars,Bin});
+	    io:request(File, {put_chars,latin1,Bin});
 	Error ->
 	    Error
     end;
@@ -1345,7 +1345,7 @@ eval_stream(Fd, Handling, Bs) ->
     eval_stream(Fd, Handling, 1, undefined, [], Bs).
 
 eval_stream(Fd, H, Line, Last, E, Bs) ->
-    eval_stream2(io:parse_erl_exprs(Fd, '', Line), Fd, H, Last, E, Bs).
+    eval_stream2(io:parse_erl_exprs(Fd, '', Line, [unicode]), Fd, H, Last, E, Bs).
 
 eval_stream2({ok,Form,EndLine}, Fd, H, Last, E, Bs0) ->
     try erl_eval:exprs(Form, Bs0) of
diff --git a/lib/kernel/src/group.erl b/lib/kernel/src/group.erl
index 334880f009..ff835e1047 100644
--- a/lib/kernel/src/group.erl
+++ b/lib/kernel/src/group.erl
@@ -227,7 +227,7 @@ io_request({put_chars,latin1,Chars}, Drv, Buf) ->
 	    send_drv(Drv, {put_chars, unicode,Binary}),
 	    {ok,ok,Buf};
 	_ ->
-	    {error,{error,{put_chars,Chars}},Buf}
+	    {error,{error,{put_chars,latin1,Chars}},Buf}
     end;
 io_request({put_chars,latin1,M,F,As}, Drv, Buf) ->
     case catch apply(M, F, As) of
diff --git a/lib/kernel/src/inet_config.erl b/lib/kernel/src/inet_config.erl
index 526baca335..aa19bd4779 100644
--- a/lib/kernel/src/inet_config.erl
+++ b/lib/kernel/src/inet_config.erl
@@ -104,7 +104,7 @@ init() ->
     %% Add inetrc config entries
     case inet_db:add_rc_list(CfgList) of
 	ok -> ok;
-	_  -> error("syntax error in ~s~n", [RcFile])
+	_  -> error("syntax error in ~ts~n", [RcFile])
     end,
 
     %% Set up a resolver configuration file for inet_res,
@@ -266,10 +266,10 @@ load_resolv(File, Func) ->
 		{ok, Ls} ->
 		    inet_db:add_rc_list(Ls);
 		{error, Reason} ->
-		    error("parse error in file ~s: ~p", [File, Reason])
+		    error("parse error in file ~ts: ~p", [File, Reason])
 	    end;
 	Error ->
-	    warning("file not found ~s: ~p~n", [File, Error])
+	    warning("file not found ~ts: ~p~n", [File, Error])
     end.
 
 %%
@@ -285,12 +285,12 @@ load_hosts(File,Os) ->
 			      inet_db:add_host(IP, [Name|Aliases]) end,
 		      Ls);
 		{error, Reason} ->
-		    error("parse error in file ~s: ~p", [File, Reason])
+		    error("parse error in file ~ts: ~p", [File, Reason])
 	    end;
 	Error ->
 	    case Os of
 		unix ->
-		    error("file not found ~s: ~p~n", [File, Error]);
+		    error("file not found ~ts: ~p~n", [File, Error]);
 		_ -> 
 		    %% for windows or nt the hosts file is not always there
 		    %% and we don't require it
@@ -462,11 +462,11 @@ get_rc(File) ->
 		{ok,Ls} -> 
 		    Ls;
 		_Error -> 
-		    error("parse error in ~s~n", [File]),
+		    error("parse error in ~ts~n", [File]),
 		    error
 	    end;
 	_Error -> 
-	    error("file ~s not found~n", [File]),
+	    error("file ~ts not found~n", [File]),
 	    error
     end.
 
@@ -495,8 +495,12 @@ warning(Fmt, Args) ->
 %% Ignore leading whitespace before a token (due to bug in erl_scan) !
 %% 
 parse_inetrc(Bin) ->
-    Str = binary_to_list(Bin) ++ "\n", 
-    parse_inetrc(Str, 1, []).
+    case file_binary_to_list(Bin) of
+        {ok, String} ->
+            parse_inetrc(String ++ "\n", 1, []);
+        error ->
+            {error, 'bad_encoding'}
+    end.
 
 parse_inetrc_skip_line([], _Line, Ack) ->
     {ok, reverse(Ack)};
@@ -535,3 +539,16 @@ parse_inetrc(Str, Line, Ack) ->
 	{more, _} -> %% Bug in erl_scan !!
 	    {error, {'scan_inetrc', {eof, Line}}}
     end.
+
+file_binary_to_list(Bin) ->
+    Enc = case epp:read_encoding_from_binary(Bin) of
+              none -> epp:default_encoding();
+              Encoding -> Encoding
+          end,
+    case catch unicode:characters_to_list(Bin, Enc) of
+        String when is_list(String) ->
+            {ok, String};
+        _ ->
+            error
+    end.
+
diff --git a/lib/kernel/src/kernel_config.erl b/lib/kernel/src/kernel_config.erl
index b1daf655c9..1649901ba7 100644
--- a/lib/kernel/src/kernel_config.erl
+++ b/lib/kernel/src/kernel_config.erl
@@ -93,7 +93,7 @@ code_change(_OldVsn, State, _Extra) ->
 sync_nodes() ->
     case catch get_sync_data() of
 	{error, Reason} = Error ->
-	    error_logger:format("~p", [Reason]),
+	    error_logger:format("~tp", [Reason]),
 	    Error;
 	{infinity, MandatoryNodes, OptionalNodes} ->
 	    case wait_nodes(MandatoryNodes, OptionalNodes) of
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index 0d59e7af67..fd59205582 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -1340,20 +1340,20 @@ start_protos(Name, [Proto | Ps], Node, Ls) ->
 		    start_protos(Name, Ps, Node, Ls)
 	    end;
 	{'EXIT', {undef,_}} ->
-	    error_logger:info_msg("Protocol: ~p: not supported~n", [Proto]),
+	    error_logger:info_msg("Protocol: ~tp: not supported~n", [Proto]),
 	    start_protos(Name,Ps, Node, Ls);
 	{'EXIT', Reason} ->
-	    error_logger:info_msg("Protocol: ~p: register error: ~p~n",
+	    error_logger:info_msg("Protocol: ~tp: register error: ~tp~n",
 				  [Proto, Reason]),
 	    start_protos(Name,Ps, Node, Ls);
 	{error, duplicate_name} ->
-	    error_logger:info_msg("Protocol: ~p: the name " ++
+	    error_logger:info_msg("Protocol: ~tp: the name " ++
 				  atom_to_list(Node) ++
 				  " seems to be in use by another Erlang node",
 				  [Proto]),
 	    start_protos(Name,Ps, Node, Ls);
 	{error, Reason} ->
-	    error_logger:info_msg("Protocol: ~p: register/listen error: ~p~n",
+	    error_logger:info_msg("Protocol: ~tp: register/listen error: ~tp~n",
 				  [Proto, Reason]),
 	    start_protos(Name,Ps, Node, Ls)
     end;
diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
index e20a2434b4..c08f5af35a 100644
--- a/lib/kernel/src/os.erl
+++ b/lib/kernel/src/os.erl
@@ -334,7 +334,7 @@ mk_cmd(Cmd) when is_atom(Cmd) ->		% backward comp.
 mk_cmd(Cmd) ->
     %% We insert a new line after the command, in case the command
     %% contains a comment character.
-    io_lib:format("(~s\n) </dev/null; echo  \"\^D\"\n", [Cmd]).
+    io_lib:format("(~ts\n) </dev/null; echo  \"\^D\"\n", [Cmd]).
 
 
 validate(Atom) when is_atom(Atom) ->
diff --git a/lib/kernel/src/user_drv.erl b/lib/kernel/src/user_drv.erl
index 8f2ca28f56..47ece5d39e 100644
--- a/lib/kernel/src/user_drv.erl
+++ b/lib/kernel/src/user_drv.erl
@@ -129,7 +129,7 @@ server1(Iport, Oport, Shell) ->
     Gr = gr_add_cur(Gr1, Curr, Shell1),
     %% Print some information.
     io_request({put_chars, unicode,
-		flatten(io_lib:format("~s\n",
+		flatten(io_lib:format("~ts\n",
 				      [erlang:system_info(system_version)]))},
 	       Iport, Oport),
     %% Enter the server loop.
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index f34341f561..ac991b1111 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -232,7 +232,7 @@ mini_server(Parent) ->
     receive
 	die ->
 	    ok;
-	{io_request,From,To,{put_chars,Data}} ->
+	{io_request,From,To,{put_chars,_Encoding,Data}} ->
 	    Parent ! {io_request,From,To,{put_chars,Data}},
 	    From ! {io_reply, To, ok},
 	    mini_server(Parent);