[shepherd] 04/08: support: Add ‘socket-address->string’.

[Ludovic Courtès]

civodul pushed a commit to branch devel
in repository shepherd.

commit 34907161f3625d66f60aba5282071e47cf5b7709
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Feb 17 18:36:28 2024 +0100

    support: Add ‘socket-address->string’.
    
    * modules/shepherd/service.scm (socket-address->string): Move to…
    * modules/shepherd/support.scm (socket-address->string): … here.
---
 modules/shepherd/service.scm | 15 ---------------
 modules/shepherd/support.scm | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/modules/shepherd/service.scm b/modules/shepherd/service.scm
index 3cfcf75..686b5cf 100644
--- a/modules/shepherd/service.scm
+++ b/modules/shepherd/service.scm
@@ -2162,21 +2162,6 @@ thrown an previously-opened sockets are closed."
               (close-port connection)
               (process pid command)))))))
 
-(define (socket-address->string address)
-  "Return a human-readable representation of ADDRESS, an object as returned by
-'make-socket-address'."
-  (let ((family (sockaddr:fam address)))
-    (cond ((= AF_INET family)
-           (string-append (inet-ntop AF_INET (sockaddr:addr address))
-                          ":" (number->string (sockaddr:port address))))
-          ((= AF_INET6 family)
-           (string-append "[" (inet-ntop AF_INET6 (sockaddr:addr address)) "]"
-                          ":" (number->string (sockaddr:port address))))
-          ((= AF_UNIX family)
-           (sockaddr:path address))
-          (else
-           (object->string address)))))
-
 (define (inetd-variables server client)
   "Return environment variables that inetd would defined for a connection of
 @var{client} to @var{server} (info \"(inetutils) Inetd Environment\")."
diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm
index 3ad2258..556ee58 100644
--- a/modules/shepherd/support.scm
+++ b/modules/shepherd/support.scm
@@ -1,6 +1,6 @@
 ;; support.scm -- Various support facilities, used by herd and shepherd.
 ;; Copyright (C) 2014 A.Sassmannshausen <alex.sassmannshausen@gmail.com>
-;; Copyright (C) 2013-2014, 2016, 2018, 2020, 2022, 2023 Ludovic Courtès 
<ludo@gnu.org>
+;; Copyright (C) 2013-2014, 2016, 2018, 2020, 2022-2024 Ludovic Courtès 
<ludo@gnu.org>
 ;; Copyright (C) 2002, 2003 Wolfgang Jährling <wolfgang@pro-linux.de>
 ;; Copyright (C) 2016 Mathieu Lirzin <mthl@gnu.org>
 ;; Copyright (C) 2018 Danny Milosavljevic <dannym@scratchpost.org>
@@ -44,6 +44,7 @@
             with-atomic-file-output
             mkdir-p
             with-directory-excursion
+            socket-address->string
 
             initialize-cli
 
@@ -271,6 +272,21 @@ given MODE."
      (lambda ()
        (chdir init)))))
 
+(define (socket-address->string address)
+  "Return a human-readable representation of ADDRESS, an object as returned by
+'make-socket-address'."
+  (let ((family (sockaddr:fam address)))
+    (cond ((= AF_INET family)
+           (string-append (inet-ntop AF_INET (sockaddr:addr address))
+                          ":" (number->string (sockaddr:port address))))
+          ((= AF_INET6 family)
+           (string-append "[" (inet-ntop AF_INET6 (sockaddr:addr address)) "]"
+                          ":" (number->string (sockaddr:port address))))
+          ((= AF_UNIX family)
+           (sockaddr:path address))
+          (else
+           (object->string address)))))
+
 
 
 (define %gettext-domain