summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--examples/echo/server.scm.in12
2 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index ce0b365..1d15d12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-02-22 Artyom Poptsov <poptsov.artyom@gmail.com>
+ * examples/echo/server.scm.in (print-help): Rename to
+ `print-help-and-exit'.
+ (main): Use it.
+
* examples/echo/client.scm.in (get-prvkey, main): Simplify checks.
* examples/echo/client.scm.in (print-help): Rename to
diff --git a/examples/echo/server.scm.in b/examples/echo/server.scm.in
index 6a9ce04..4e92bec 100644
--- a/examples/echo/server.scm.in
+++ b/examples/echo/server.scm.in
@@ -121,7 +121,7 @@
(r (string-append res str) (read-line port 'concat))
res)))
-(define (print-help)
+(define (print-help-and-exit)
"Print help message and exit."
(display "\
Usage: server.scm [ options ]
@@ -131,8 +131,8 @@ Options:
--dsakey=<key>, -d <key> Set host DSA key.
--port=<port>, -p <port> Set bind port of the server.
--help, -h Print this message and exit.
-"))
-
+")
+ (exit 0))
(define *option-spec*
'((dsakey (single-char #\d) (value #t))
@@ -148,10 +148,8 @@ Options:
(port (option-ref options 'port *default-bindport*))
(help-wanted (option-ref options 'help #f)))
- (if help-wanted
- (begin
- (print-help)
- (exit)))
+ (and help-wanted
+ (print-help-and-exit))
(let ((server (make-server #:bindport (string->number port)
#:rsakey rsakey