X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=datetime.lisp;h=59c1b3e140bdaf969cb36abcdf53313ffb56d214;hp=52d45b2a43b044e6919f77778fd6f9d4f7218296;hb=d557c191f92e4e5a3cd4ca3fdd14a78444002c64;hpb=6173eb9ecdf840a556a60092c2f458860709cfd1 diff --git a/datetime.lisp b/datetime.lisp index 52d45b2..59c1b3e 100644 --- a/datetime.lisp +++ b/datetime.lisp @@ -41,7 +41,7 @@ (multiple-value-bind (sec min hr day mon year dow daylight-p zone) (decode-universal-time ut) (declare (ignore daylight-p zone)) - (format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~], ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d" + (format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~], ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d" dow day (1- mon) @@ -74,6 +74,9 @@ (defun posix-time-to-utime (time) (+ time +posix-epoch+)) +(defun utime-to-posix-time (utime) + (- utime +posix-epoch+)) + ;; Monthnames taken from net-telent-date to support lml2 (defvar *monthnames* @@ -89,9 +92,10 @@ (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" + (declare (ignore colon-p)) (let ((monthstring (cdr (assoc arg *monthnames*)))) (if (not monthstring) (return-from monthname nil)) (let ((truncate (if width (min width (length monthstring)) nil))) @@ -100,7 +104,7 @@ mincol colinc minpad padchar (subseq monthstring 0 truncate))))) -;;;; Daylight Saving Time calculations +;;;; Daylight Saving Time calculations ;; Daylight Saving Time begins for most of the United States at 2 ;; a.m. on the first Sunday of April. Time reverts to standard time at