From 514d61b986fa3762e450046afeb1468587190e1b Mon Sep 17 00:00:00 2001
From: interp <interp>
Date: Sat, 24 Aug 2002 16:43:26 +0000
Subject: [PATCH] moving proc socket-address->string from ftpd internal to
 sunet-utilities exports

---
 scheme/ftpd/ftpd.scm           | 13 +------------
 scheme/lib/sunet-utilities.scm | 12 ++++++++++++
 scheme/packages.scm            |  4 +++-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/scheme/ftpd/ftpd.scm b/scheme/ftpd/ftpd.scm
index be6e6cd..545885a 100644
--- a/scheme/ftpd/ftpd.scm
+++ b/scheme/ftpd/ftpd.scm
@@ -179,17 +179,6 @@
 	  (socket:outport socket)))
 
 
-(define (socket-address->string socket-address . with-port?)
-  (let ((with-port? (optional with-port? #t)))
-    (receive (host-address service-port)
-	     (socket-address->internet-address socket-address)
-	     (if with-port?
-		 (format #f "~A:~A"
-			 (format-internet-host-address host-address)
-			 (format-port service-port))
-		 (format #f "~A"
-			 (format-internet-host-address host-address))))))
-
 ;;; ftpd  -------------------------------------------------------
 
 (define (ftpd anonymous-home . maybe-args)
@@ -1229,7 +1218,7 @@
 
 ; Version
 
-(define *ftpd-version* "$Revision: 1.4 $")
+(define *ftpd-version* "$Revision: 1.5 $")
 
 (define (copy-port->port-binary input-port output-port)
   (let ((buffer (make-string *window-size*)))
diff --git a/scheme/lib/sunet-utilities.scm b/scheme/lib/sunet-utilities.scm
index 734a222..ca67e37 100644
--- a/scheme/lib/sunet-utilities.scm
+++ b/scheme/lib/sunet-utilities.scm
@@ -14,3 +14,15 @@
     (let ((next (next-sigevent event interrupt)))
       (thunk)
       (lp next))))
+
+(define (socket-address->string socket-address . with-port?)
+  (let ((with-port? (:optional with-port? #t)))
+    (receive (host-address service-port)
+	     (socket-address->internet-address socket-address)
+	     (if with-port?
+		 (format #f "~A:~A"
+			 (format-internet-host-address host-address)
+			 (format-port service-port))
+		 (format #f "~A"
+			 (format-internet-host-address host-address))))))
+
diff --git a/scheme/packages.scm b/scheme/packages.scm
index 7b4af9f..1287309 100644
--- a/scheme/packages.scm
+++ b/scheme/packages.scm
@@ -232,7 +232,8 @@
 
 (define-interface sunet-utilities-interface
   (export host-name-or-ip
-	  on-interrupt))
+	  on-interrupt
+	  socket-address->string))
 
 (define-interface handle-fatal-error-interface
   (export with-fatal-error-handler*
@@ -598,6 +599,7 @@
 	scheme
 	format-net
 	sigevents
+	let-opt
 	handle-fatal-error)
   (files (lib sunet-utilities)))