From ecdb8dfe6211812b7a4dcc45ffab1e4ec5ee5643 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Mon, 30 Jan 2017 09:30:08 -0800
Subject: [PATCH] extra: cleanup some example servers, allow port to be
 specified on command line.

---
 extra/echo-server/echo-server.factor | 12 ++++++------
 extra/time-server/time-server.factor | 16 +++++++++-------
 extra/tty-server/tty-server.factor   |  7 ++++---
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/extra/echo-server/echo-server.factor b/extra/echo-server/echo-server.factor
index 50364c02b9..a34e64c4f5 100644
--- a/extra/echo-server/echo-server.factor
+++ b/extra/echo-server/echo-server.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2012 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license.
 
-USING: accessors kernel io io.encodings.binary io.servers ;
+USING: accessors command-line io io.encodings.binary io.servers
+kernel math.parser namespaces sequences ;
 
 IN: echo-server
 
@@ -14,9 +15,8 @@ IN: echo-server
         "echo.server" >>name
         [ echo-loop ] >>handler ;
 
-: echod ( port -- server )
-    <echo-server> start-server ;
+: echo-server-main ( -- )
+    command-line get [ 1234 ] [ first string>number ] if-empty
+    <echo-server> start-server wait-for-server ;
 
-: echod-main ( -- ) 1234 echod drop ;
-
-MAIN: echod-main
+MAIN: echo-server-main
diff --git a/extra/time-server/time-server.factor b/extra/time-server/time-server.factor
index 63459b054d..1b2f14650a 100644
--- a/extra/time-server/time-server.factor
+++ b/extra/time-server/time-server.factor
@@ -1,19 +1,21 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors calendar calendar.format io io.encodings.ascii
-io.servers kernel threads ;
+USING: accessors calendar calendar.format command-line io
+io.encodings.ascii io.servers kernel math.parser namespaces
+sequences threads ;
 IN: time-server
 
 : handle-time-client ( -- )
     now timestamp>rfc822 print ;
 
-: <time-server> ( -- threaded-server )
+: <time-server> ( port -- threaded-server )
     ascii <threaded-server>
         "time-server" >>name
-        1234 >>insecure
+        swap >>insecure
         [ handle-time-client ] >>handler ;
 
-: start-time-server ( -- )
-    <time-server> start-server drop ;
+: time-server-main ( -- )
+    command-line get [ 1234 ] [ first string>number ] if-empty
+    <time-server> start-server wait-for-server ;
 
-MAIN: start-time-server
+MAIN: time-server-main
diff --git a/extra/tty-server/tty-server.factor b/extra/tty-server/tty-server.factor
index 6fef3b9ef4..28b340e397 100644
--- a/extra/tty-server/tty-server.factor
+++ b/extra/tty-server/tty-server.factor
@@ -1,5 +1,5 @@
-USING: accessors debugger kernel listener io.servers
-io.encodings.utf8 namespaces ;
+USING: accessors command-line debugger io.encodings.utf8
+io.servers kernel listener math.parser namespaces sequences ;
 
 IN: tty-server
 
@@ -14,6 +14,7 @@ IN: tty-server
         f >>timeout ;
 
 : run-tty-server ( -- )
-    9999 <tty-server> start-server drop ;
+    command-line get [ 9999 ] [ first string>number ] if-empty
+    <tty-server> start-server wait-for-server ;
 
 MAIN: run-tty-server
-- 
2.34.1