From 0d4a6b50fe8a353b6b83befb115ee9e157275a02 Mon Sep 17 00:00:00 2001
From: Fredrik Gustafsson <fredrik@erlang.org>
Date: Thu, 7 Mar 2013 17:32:02 +0100
Subject: Changed handshake from to_erl to run_erl, on behalf of shell search

---
 erts/etc/unix/run_erl.c            |  2 +-
 erts/etc/unix/to_erl.c             |  2 +-
 lib/stdlib/test/io_proto_SUITE.erl | 18 ++++++------------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c
index 910be3dce8..a3bcdb85d9 100644
--- a/erts/etc/unix/run_erl.c
+++ b/erts/etc/unix/run_erl.c
@@ -682,7 +682,7 @@ static void pass_on(pid_t childpid)
 		    }
 		}
 
-		if (!got_some && wfd && buf[0] == '\022') {
+		if (!got_some && wfd && buf[0] == '\014') {
 		    char wbuf[30];
 		    int wlen = sn_printf(wbuf,sizeof(wbuf),"[run_erl v%u-%u]\n",
 					 RUN_ERL_HI_VER, RUN_ERL_LO_VER);
diff --git a/erts/etc/unix/to_erl.c b/erts/etc/unix/to_erl.c
index 754b349338..094006c5fd 100644
--- a/erts/etc/unix/to_erl.c
+++ b/erts/etc/unix/to_erl.c
@@ -353,7 +353,7 @@ int main(int argc, char **argv)
      * at the start of every new to_erl-session.
      */
 
-    if (write(wfd, "\022", 1) < 0) {
+    if (write(wfd, "\014", 1) < 0) {
 	fprintf(stderr, "Error in writing ^R to FIFO.\n");
     }
 
diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl
index e16ba55481..76a8109a8d 100644
--- a/lib/stdlib/test/io_proto_SUITE.erl
+++ b/lib/stdlib/test/io_proto_SUITE.erl
@@ -147,8 +147,7 @@ unicode_prompt(Config) when is_list(Config) ->
     %% And one with oldshell
      ?line rtnode([{putline,""},
 		   {putline, "2."},
-		   {getline_re, ".*2."},
-		   {getline, "2"},
+		   {getline_re, ".*2$"},
 		   {putline, "shell:prompt_func({io_proto_SUITE,uprompt})."},
 		   {getline_re, ".*default"},
 		   {putline, "io:get_line('')."},
@@ -263,8 +262,7 @@ setopts_getopts(Config) when is_list(Config) ->
     %% And one with oldshell
     ?line rtnode([{putline,""},
 		  {putline, "2."},
-		  {getline_re, ".*2."},
-		  {getline, "2"},
+		  {getline_re, ".*2$"},
 		  {putline, "lists:keyfind(binary,1,io:getopts())."},
 		  {getline_re, ".*{binary,false}"},
 		  {putline, "io:get_line('')."},
@@ -467,8 +465,7 @@ unicode_options(Config) when is_list(Config) ->
     end,
     ?line rtnode([{putline,""},
 		  {putline, "2."},
-		  {getline_re, ".*2."},
-		  {getline, "2"},
+		  {getline_re, ".*2$"},
 		  {putline, "lists:keyfind(encoding,1,io:getopts())."},
 		  {getline_re, ".*{encoding,latin1}"},
 		  {putline, "io:format(\"~ts~n\",[[1024]])."},
@@ -701,8 +698,7 @@ binary_options(Config) when is_list(Config) ->
 	old ->
 	    ok;
 	new ->
-	    ?line rtnode([{putline,""},
-			  {putline, "2."},
+	    ?line rtnode([{putline, "2."},
 			  {getline, "2"},
 			  {putline, "lists:keyfind(binary,1,io:getopts())."},
 			  {getline, "{binary,false}"},
@@ -720,10 +716,8 @@ binary_options(Config) when is_list(Config) ->
 			 ],[])
     end,
    %% And one with oldshell
-    ?line rtnode([{putline,""},
-		  {putline, "2."},
-		  {getline_re, ".*2."},
-		  {getline, "2"},
+    ?line rtnode([{putline, "2."},
+		  {getline_re, ".*2$"},
 		  {putline, "lists:keyfind(binary,1,io:getopts())."},
 		  {getline_re, ".*{binary,false}"},
 		  {putline, "io:get_line('')."},
-- 
cgit v1.2.3