File 3843-ssh-Use-group_leader-of-process-calling-ss... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 3843-ssh-Use-group_leader-of-process-calling-ssh-connect-.patch of Package erlang (Revision 2ace71662e6798e9ff6c2a98c08c5d61)

Currently displaying revision 2ace71662e6798e9ff6c2a98c08c5d61 , Show latest

From 12694373e10c0bf5ed55cc78b194a6af6f75fc1c Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Fri, 26 Feb 2021 14:22:20 +0100
Subject: [PATCH 3/5] ssh: Use group_leader of process calling ssh:connect for
 user i/o

---
 lib/ssh/src/ssh_connection_handler.erl | 19 +++++-----
 lib/ssh/src/ssh_io.erl                 | 48 ++++++++------------------
 2 files changed, 24 insertions(+), 43 deletions(-)

diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index fc689b81d6..d8eff85017 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -137,8 +137,15 @@ start_link(Role, Host, Port, Socket, Options0, NegotiationTimeout) ->
                                              [{spawn_opt, [{message_queue_data,off_heap}]}]]
                                            ) of
             {ok, Pid} ->
-                %% Now the connection_handler process is started, but no message handling
-                %% begins until the socket_control is called
+                %% Now the connection_handler process is started
+                %% First set the group leader if it is a client:
+                case Role of
+                    client ->
+                        group_leader(group_leader(), Pid);
+                    _ ->
+                        ok
+                end,
+                %% No message handling yet. It begins when the socket_control/3 is called
                 case socket_control(Socket, Pid, Options) of
                     ok ->
                         %% handshake returns {ok,Pid} after a successful connection setup.
@@ -543,14 +550,6 @@ handshake(Pid, Ref, Timeout) ->
 	    {ok, Pid};
 	{Pid, not_connected, Reason} ->
 	    {error, Reason};
-	{Pid, user_password} ->
-	    Pass = io:get_password(),
-	    Pid ! Pass,
-	    handshake(Pid, Ref, Timeout);
-	{Pid, question} ->
-	    Answer = io:get_line(""),
-	    Pid ! Answer,
-	    handshake(Pid, Ref, Timeout);
 	{'DOWN', _, process, Pid, {shutdown, Reason}} ->
 	    {error, Reason};
 	{'DOWN', _, process, Pid, Reason} ->
diff --git a/lib/ssh/src/ssh_io.erl b/lib/ssh/src/ssh_io.erl
index a7cd1daeec..d6fdb56860 100644
--- a/lib/ssh/src/ssh_io.erl
+++ b/lib/ssh/src/ssh_io.erl
@@ -27,49 +27,31 @@
 -export([yes_no/2, read_password/2, read_line/2, format/2]).
 -include("ssh.hrl").
 
-read_line(Prompt, Opts) ->
+read_line(Prompt, _Opts) ->
     format("~s", [listify(Prompt)]),
-    ?GET_INTERNAL_OPT(user_pid, Opts) ! {self(), question},
-    receive
-	Answer when is_list(Answer) or is_binary(Answer) ->
-	    unicode:characters_to_list(Answer)
-    end.
+    unicode:characters_to_list(io:get_line("")).
 
 yes_no(Prompt, Opts) ->
     format("~s [y/n]?", [Prompt]),
-    ?GET_INTERNAL_OPT(user_pid, Opts) ! {self(), question},
-    receive
-	%% I can't see that the atoms y and n are ever received, but it must
-	%% be investigated before removing
-	y -> yes;
-	n -> no;
-
-	Answer when is_list(Answer) or is_binary(Answer) ->
-	    case trim(Answer) of
-		"y" -> yes;
-		"n" -> no;
-		"Y" -> yes;
-		"N" -> no;
-		_ ->
-		    format("please answer y or n\n",[]),
-		    yes_no(Prompt, Opts)
-	    end
+    case trim(io:get_line("")) of
+        "y" -> yes;
+        "n" -> no;
+        "Y" -> yes;
+        "N" -> no;
+        _ ->
+            format("please answer y or n\n",[]),
+            yes_no(Prompt, Opts)
     end.
 
 read_password(Prompt, Opts) ->
     format("~s", [listify(Prompt)]),
-    ?GET_INTERNAL_OPT(user_pid, Opts) ! {self(), user_password},
-    receive
-	Answer when is_list(Answer) or is_binary(Answer) ->
-	     case trim(Answer) of
-		 "" ->
-		     read_password(Prompt, Opts);
-		 Pwd ->
-		     Pwd
-	     end
+    case trim(io:get_password()) of
+        "" ->
+            read_password(Prompt, Opts);
+        Pwd ->
+            Pwd
     end.
 
-
 format(Fmt, Args) ->
     io:format(Fmt, Args).
 
-- 
2.26.2

Places

File 3843-ssh-Use-group_leader-of-process-calling-ssh-connect-.patch of Package erlang (Revision 2ace71662e6798e9ff6c2a98c08c5d61)

Places