File 3831-ssh-Introduce-ssh_lib.erl.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 3831-ssh-Introduce-ssh_lib.erl.patch of Package erlang (Revision 49aa26b943fcbed41dda0b0a8caee5fb)

Currently displaying revision 49aa26b943fcbed41dda0b0a8caee5fb , Show latest

From 804e1a404595834f9212ea8eb79e6478c3e612f6 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 9 Feb 2021 13:39:23 +0100
Subject: [PATCH 01/10] ssh: Introduce ssh_lib.erl

---
 lib/ssh/src/Makefile    |  1 +
 lib/ssh/src/ssh.app.src |  3 +-
 lib/ssh/src/ssh_lib.erl | 62 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 lib/ssh/src/ssh_lib.erl

diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
index ab6137e518..dd8fcdf99c 100644
--- a/lib/ssh/src/Makefile
+++ b/lib/ssh/src/Makefile
@@ -71,6 +71,7 @@ MODULES= \
 	ssh_file \
 	ssh_info \
 	ssh_io \
+	ssh_lib \
 	ssh_message \
 	ssh_no_io \
 	ssh_options \
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 6974290ac7..9ec0d2c9bd 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -23,12 +23,13 @@
              ssh_controller,
 	     ssh_daemon_channel,
 	     ssh_dbg,
+             ssh_lib,
 	     ssh_shell,
 	     sshc_sup,
 	     sshd_sup,
-	     ssh_file,
 	     ssh_io,
 	     ssh_info,
+	     ssh_file,
 	     ssh_no_io,
 	     ssh_server_channel,
              ssh_server_key_api,
diff --git a/lib/ssh/src/ssh_lib.erl b/lib/ssh/src/ssh_lib.erl
new file mode 100644
index 0000000000..c1553896fa
--- /dev/null
+++ b/lib/ssh/src/ssh_lib.erl
@@ -0,0 +1,62 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2004-2020. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%% Common library routines in the SSH application
+%% 
+
+-module(ssh_lib).
+
+-export([
+         format_address_port/2, format_address_port/1,
+         format_address/1,
+         format_time_ms/1
+        ]).
+
+%%%----------------------------------------------------------------
+format_address_port({IP,Port}) when is_integer(Port) ->
+    format_address_port(IP, Port);
+format_address_port(X) ->
+    io_lib:format("~p", [X]).
+
+%%%----------------------------------------------------------------
+format_address_port(Address, Port) ->
+    try lists:concat([format_address(Address), ":", Port])
+    catch
+        _:_ -> io_lib:format("~p:~p",[Address,Port])
+    end.
+
+%%%----------------------------------------------------------------
+format_address(A) ->
+    try inet:ntoa(A)
+    catch
+        _:_ when is_list(A) -> A;
+        _:_ -> io_lib:format('~p',[A])
+    end.
+
+%%%----------------------------------------------------------------
+format_time_ms(T) when is_integer(T) ->
+    if
+        T < 60000 -> io_lib:format("~.3f sec", [T/1000]);
+        true -> io_lib:format("~p min ~s", [T div 60000, format_time_ms(T rem 60000)])
+    end.
+
+            
+            
-- 
2.26.2

Places

File 3831-ssh-Introduce-ssh_lib.erl.patch of Package erlang (Revision 49aa26b943fcbed41dda0b0a8caee5fb)

Places