File 0618-ssh-Remove-conflicting-cli-actions-and-pot... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0618-ssh-Remove-conflicting-cli-actions-and-potential-cra.patch of Package erlang (Revision 15b24e456ec31eded623c8b8a9e37cc4)

Currently displaying revision 15b24e456ec31eded623c8b8a9e37cc4 , Show latest

From e8d8ed4f89e697ca28d8c2228ce1d340ac2d99b7 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Mon, 17 Aug 2020 14:19:28 +0200
Subject: [PATCH] ssh: Remove conflicting cli actions and potential crash on
 window width change

---
 lib/ssh/src/ssh_cli.erl | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/lib/ssh/src/ssh_cli.erl b/lib/ssh/src/ssh_cli.erl
index d6c8cf84ed..da21ffb9d3 100644
--- a/lib/ssh/src/ssh_cli.erl
+++ b/lib/ssh/src/ssh_cli.erl
@@ -390,14 +390,29 @@ delete_chars(N, {Buf, BufTail, Col}, Tty) -> % N < 0
 %%% if current window is wider than previous)
 window_change(Tty, OldTty, Buf)
   when OldTty#ssh_pty.width == Tty#ssh_pty.width ->
+     %% No line width change
     {[], Buf};
 window_change(Tty, OldTty, {Buf, BufTail, Col}) ->
-    M1 = move_cursor(Col, 0, OldTty),
-    N = erlang:max(Tty#ssh_pty.width - OldTty#ssh_pty.width, 0) * 2,
-    S = lists:reverse(Buf, [BufTail | lists:duplicate(N, $ )]),
-    M2 = move_cursor(length(Buf) + length(BufTail) + N, Col, Tty),
-    {[M1, S | M2], {Buf, BufTail, Col}}.
-    
+    case OldTty#ssh_pty.width - Tty#ssh_pty.width of
+        0 ->
+            %% No line width change
+            {[], {Buf,BufTail,Col}};
+
+        DeltaW0 when DeltaW0 < 0,
+                     BufTail == [] ->
+            % Line width is decreased, cursor is at end of input
+            {[], {Buf,BufTail,Col}};
+
+        DeltaW0 when DeltaW0 < 0,
+                     BufTail =/= [] ->
+            % Line width is decreased, cursor is not at end of input
+            {[], {Buf,BufTail,Col}};
+
+        DeltaW0 when DeltaW0 > 0 ->
+            % Line width is increased
+            {[], {Buf,BufTail,Col}}
+        end.
+
 %% move around in buffer, respecting pad characters
 step_over(0, Buf, [?PAD | BufTail], Col) ->
     {[?PAD | Buf], BufTail, Col+1};
-- 
2.26.2

Places

File 0618-ssh-Remove-conflicting-cli-actions-and-potential-cra.patch of Package erlang (Revision 15b24e456ec31eded623c8b8a9e37cc4)

Places