[movitz-cvs] CVS update: movitz/losp/lib/net/tftp.lisp

[Frode Vatvedt Fjeld]

Update of /project/movitz/cvsroot/movitz/losp/lib/net
In directory common-lisp.net:/tmp/cvs-serv26372

Modified Files:
	tftp.lisp 
Log Message:
Minor output niceties.

Date: Wed Nov 24 17:22:21 2004
Author: ffjeld

Index: movitz/losp/lib/net/tftp.lisp
diff -u movitz/losp/lib/net/tftp.lisp:1.1 movitz/losp/lib/net/tftp.lisp:1.2
--- movitz/losp/lib/net/tftp.lisp:1.1	Wed Nov 24 15:27:14 2004
+++ movitz/losp/lib/net/tftp.lisp	Wed Nov 24 17:22:21 2004
@@ -10,7 +10,7 @@
 ;;;; Author:        Frode Vatvedt Fjeld <frodef at acm.org>
 ;;;; Created at:    Wed Oct  6 12:42:51 2004
 ;;;;                
-;;;; $Id: tftp.lisp,v 1.1 2004/11/24 14:27:14 ffjeld Exp $
+;;;; $Id: tftp.lisp,v 1.2 2004/11/24 16:22:21 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -84,8 +84,8 @@
 		 for ack = nil then (receive *ip4-nic* ack)
 		 until
 		   (with-simple-restart (continue
-					 "Continue TFTP stop-and-wait for block ~D~@[, port ~D~]."
-					 ack-block-number port)
+					 "Continue TFTP stop-and-wait for ~S block ~D~@[, port ~D~]."
+					 file-name ack-block-number port)
 		     (when (funcall breaker)
 		       (break "TFTP/Ethernet"))
 		     (when (< (* timeout internal-time-units-per-second)
@@ -137,7 +137,8 @@
 		       (setf (fill-pointer packet) j))
 		 (format-udp-header packet :destination ip :destination-port port)
 		 (format-ethernet-packet packet (mac-address *ip4-nic*) mac +ether-type-ip4+)
-		 (write-char #\. speak)
+		 (when speak
+		   (write-char #\. speak))
 		 (transmit-stop-and-wait packet block-number port)))
 	(format speak "done.")
 	(values)))))