r8595: changes for lml2 rework

diff --git a/datetime.lisp b/datetime.lisp
index 288d3c85740bd616cde4234cd99364e4ff404fdc..52d45b2a43b044e6919f77778fd6f9d4f7218296 100644 (file)
--- a/datetime.lisp
+++ b/datetime.lisp
@@ -74,6 +74,32 @@
 (defun posix-time-to-utime (time)
   (+ time +posix-epoch+))
 
 (defun posix-time-to-utime (time)
   (+ time +posix-epoch+))
 

+;; Monthnames taken from net-telent-date to support lml2
+
+(defvar *monthnames*
+  '((1 . "January")
+    (2 . "February")
+    (3 . "March")
+    (4 . "April")
+    (5 . "May")
+    (6 . "June")
+    (7 . "July")
+    (8 . "August")
+    (9 . "September")
+    (10 . "October")
+    (11 . "November")
+    (12 . "December")))
+    
+(defun monthname (stream arg colon-p at-p &optional width (mincol 0) (colinc 1) (minpad 0) (padchar #\Space))
+  "Print the name of the month (1=January) corresponding to ARG on STREAM.  This is intended for embedding in a FORMAT directive: WIDTH governs the number of characters of text printed, MINCOL, COLINC, MINPAD, PADCHAR work as for ~A"
+  (let ((monthstring (cdr (assoc arg *monthnames*))))
+    (if (not monthstring) (return-from monthname nil))
+    (let ((truncate (if width (min width (length monthstring)) nil)))
+      (format stream
+              (if at-p "~V,V,V,V@A" "~V,V,V,VA")
+              mincol colinc minpad padchar
+              (subseq monthstring 0 truncate)))))
+

 ;;;; Daylight Saving Time calculations 
 
 ;; Daylight Saving Time begins for most of the United States at 2
 ;;;; Daylight Saving Time calculations 
 
 ;; Daylight Saving Time begins for most of the United States at 2

diff --git a/io.lisp b/io.lisp
index 292af3c68382cc23da07f6603a1d89ee13a84c72..d4c50ef6b28a5e93c960558ffc18fbbcf3b4fc55 100644 (file)
--- a/io.lisp
+++ b/io.lisp
@@ -21,12 +21,13 @@
 (defun print-file-contents (file &optional (strm *standard-output*))
   "Opens a reads a file. Returns the contents as a single string"
   (when (probe-file file)
 (defun print-file-contents (file &optional (strm *standard-output*))
   "Opens a reads a file. Returns the contents as a single string"
   (when (probe-file file)

-    (with-open-file (in file :direction :input)
-      (let ((eof (gensym)))                
-       (do ((line (read-line in nil eof) 
-                  (read-line in nil eof)))
-           ((eq line eof))
-         (format strm "~A~%" line))))))
+    (let ((eof (cons 'eof nil)))
+      (with-open-file (in file :direction :input)
+        (do ((line (read-line in nil eof) 
+                   (read-line in nil eof)))
+            ((eq line eof))
+          (write-string line strm)
+          (write-char #\newline strm))))))

 
 (defun read-file-to-string (file)
   "Opens a reads a file. Returns the contents as a single string"
 
 (defun read-file-to-string (file)
   "Opens a reads a file. Returns the contents as a single string"