OTP-8418 user.erl (used in oldshell) is updated to handle unicode in

          prompt strings (io:get_line/{1,2}). io_lib is also updated to
          format prompts with the 't' modifier (i.e. ~ts instead of ~s).

5 files changed, 84 insertions, 21 deletions

diff --git a/lib/kernel/src/user.erl b/lib/kernel/src/user.erl
index edf650ec59..17dc5a56a2 100644
--- a/lib/kernel/src/user.erl
+++ b/lib/kernel/src/user.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1996-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 -module(user).
@@ -698,7 +698,11 @@ get_chars_more(State, M, F, Xa, Port, Q, Fmt) ->
 prompt(_Port, '') -> ok;
 
 prompt(Port, Prompt) ->
-    put_port(io_lib:format_prompt(Prompt), Port).
+    put_port(wrap_characters_to_binary(io_lib:format_prompt(Prompt),unicode,
+				       case get(unicode) of 
+					   true -> unicode;
+					   _ -> latin1
+				       end), Port).
 
 %% Convert error code to make it look as before
 err_func(io_lib, get_until, {_,F,_}) ->
diff --git a/lib/stdlib/doc/src/shell.xml b/lib/stdlib/doc/src/shell.xml
index 2a7c5b8c69..73cc1b33bd 100644
--- a/lib/stdlib/doc/src/shell.xml
+++ b/lib/stdlib/doc/src/shell.xml
@@ -755,10 +755,11 @@ loop(N) ->
       created by the shell. Currently there is only one pair:
       <c>{history, N}</c>, where N is the current command number. The
       function should return a list of characters or an atom. This
-      constraint is due to the Erlang I/O-protocol. Note that in
-      restricted mode the call <c>Mod:Func(L)</c> must be allowed or
-      the default shell prompt function will be called.</p>
-  </section>
+      constraint is due to the Erlang I/O-protocol. Unicode characters
+      beyond codepoint 255 are allowed in the list. Note
+      that in restricted mode the call <c>Mod:Func(L)</c> must be
+      allowed or the default shell prompt function will be called.</p>
+      </section>
 
   <funcs>
     <func>
diff --git a/lib/stdlib/src/io_lib.erl b/lib/stdlib/src/io_lib.erl
index 2d3c86e4ea..26f6ec8931 100644
--- a/lib/stdlib/src/io_lib.erl
+++ b/lib/stdlib/src/io_lib.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1996-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 
@@ -139,9 +139,9 @@ format_prompt({format,Format,Args}) ->
     format_prompt(Format,Args);
 format_prompt(Prompt)
   when is_list(Prompt); is_atom(Prompt); is_binary(Prompt) ->
-    format_prompt("~s", [Prompt]);
+    format_prompt("~ts", [Prompt]);
 format_prompt(Prompt) ->
-    format_prompt("~p", [Prompt]).
+    format_prompt("~tp", [Prompt]).
 
 format_prompt(Format, Args) ->
     case catch io_lib:format(Format, Args) of
diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl
index 59aa175c73..93159fbd5b 100644
--- a/lib/stdlib/test/io_proto_SUITE.erl
+++ b/lib/stdlib/test/io_proto_SUITE.erl
@@ -23,7 +23,7 @@
 -export([init_per_testcase/2, fin_per_testcase/2]).
 
 -export([setopts_getopts/1,unicode_options/1,unicode_options_gen/1, binary_options/1, bc_with_r12/1,
-	 bc_with_r12_gl/1, read_modes_gl/1,bc_with_r12_ogl/1, read_modes_ogl/1, broken_unicode/1,eof_on_pipe/1]).
+	 bc_with_r12_gl/1, read_modes_gl/1,bc_with_r12_ogl/1, read_modes_ogl/1, broken_unicode/1,eof_on_pipe/1,unicode_prompt/1]).
 
 
 -export([io_server_proxy/1,start_io_server_proxy/0, proxy_getall/1, proxy_setnext/2, proxy_quit/1]).
@@ -31,6 +31,8 @@
 -export([toerl_server/3,hold_the_line/3,answering_machine1/3,
 	 answering_machine2/3]).
 
+-export([uprompt/1]).
+
 %-define(without_test_server, true).
 
 -ifdef(without_test_server).
@@ -43,7 +45,7 @@
 -define(privdir(Conf), ?config(priv_dir, Conf)).
 -endif.
 
-%-define(debug, true).
+-define(debug, true).
 
 -ifdef(debug).
 -define(format(S, A), io:format(S, A)).
@@ -82,7 +84,7 @@ all(doc) ->
 all(suite) ->
     [setopts_getopts, unicode_options, unicode_options_gen, binary_options, bc_with_r12, 
      bc_with_r12_gl,bc_with_r12_ogl, read_modes_gl, read_modes_ogl, 
-     broken_unicode,eof_on_pipe].
+     broken_unicode,eof_on_pipe,unicode_prompt].
 
 
 -record(state, {
@@ -91,6 +93,48 @@ all(suite) ->
 	  mode = list
 	  }).
 
+uprompt(_L) ->
+    [1050,1072,1082,1074,1086,32,1077,32,85,110,105,99,111,100,101,32,63].
+
+unicode_prompt(suite) ->
+    [];
+unicode_prompt(doc) ->
+    ["Test that an Unicode prompt does not crash the shell"];
+unicode_prompt(Config) when is_list(Config) ->
+    ?line PA = filename:dirname(code:which(?MODULE)),
+    ?line rtnode([{putline,""},
+		  {putline, "2."},
+		  {getline, "2"},
+		  {putline, "shell:prompt_func({io_proto_SUITE,uprompt})."},
+		  {getline, "default"},
+		  {putline, "io:get_line('')."},
+		  {putline, "hej"},
+		  {getline, "\"hej\\n\""},
+		  {putline, "io:setopts([{binary,true}])."},
+		  {getline, "ok"},
+		  {putline, "io:get_line('')."},
+		  {putline, "hej"},
+		  {getline, "<<\"hej\\n\">>"}
+		  ],[],[],"-pa "++ PA),
+    %% And one with oldshell
+     ?line rtnode([{putline,""},
+		   {putline, "2."},
+		   {getline_re, ".*2."},
+		   {getline, "2"},
+		   {putline, "shell:prompt_func({io_proto_SUITE,uprompt})."},
+		   {getline_re, ".*default"},
+		   {putline, "io:get_line('')."},
+		   {putline, "hej"},
+		   {getline_re, ".*\"hej\\\\n\""},
+		   {putline, "io:setopts([{binary,true}])."},
+		   {getline_re, ".*ok"},
+		   {putline, "io:get_line('')."},
+		   {putline, "hej"},
+		   {getline_re, ".*<<\"hej\\\\n\">>"}
+		  ],[],[],"-oldshell -pa "++PA),
+    ok.
+    
+
 setopts_getopts(suite) ->
     [];
 setopts_getopts(doc) ->
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index da73046c2a..588342d46a 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -34,7 +34,8 @@
 	 start_restricted_on_command_line/1,restricted_local/1]).
 
 %% Internal export.
--export([otp_5435_2/0, prompt1/1, prompt2/1, prompt3/1, prompt4/1]).
+-export([otp_5435_2/0, prompt1/1, prompt2/1, prompt3/1, prompt4/1,
+	 prompt5/1]).
 
 %%
 %% Define to run outside of test server
@@ -2618,6 +2619,16 @@ otp_8393(Config) when is_list(Config) ->
     ?line "default\nl.\n" = 
         t(<<"shell:prompt_func({shell_SUITE,prompt3}). l.">>),
 
+    %%
+    %% Although this tests that you can set a unicode prompt function
+    %% it does not really test that it does work with the io-servers.
+    %% That is instead tested in the io_proto_SUITE, which has
+    %% the right infrastructure in place for such tests. /PaN
+    %%
+    ?line _ = shell:prompt_func(default),
+    ?line "default\nl.\n" = 
+        t(<<"shell:prompt_func({shell_SUITE,prompt5}). l.">>),
+
     %% Restricted shell.
     Contents = <<"-module(test_restricted_shell).
                   -export([local_allowed/3, non_local_allowed/3]).
@@ -2672,6 +2683,9 @@ prompt3(L) ->
 prompt4(_L) ->
     erlang:apply({erlang,'/'}, [1,0]).
 
+prompt5(_L) ->
+    [1050,1072,1082,1074,1086,32,1077,32,85,110,105,99,111,100,101,32,63].
+
 -ifdef(not_used).
 exit_term(B) ->
     "** exception exit:" ++ Reply = t(B),