diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-12-08 17:04:29 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-12-08 18:33:56 +0200 |
commit | acec689ef648adaa5c420049bfb775953e184bda (patch) | |
tree | ac5a96099e5a646fc24986650b4f9073c9e83642 /libmailutils/tests/scantime.at | |
parent | 5af1d3a7bd8149139ad59baa11501e3d11b138a7 (diff) | |
download | mailutils-acec689ef648adaa5c420049bfb775953e184bda.tar.gz mailutils-acec689ef648adaa5c420049bfb775953e184bda.tar.bz2 |
Revamp date/time calculations.
* configure.ac: Build libmailutils/datetime/Makefile.am
* include/mailutils/datetime.h (mu_datetime_julianday)
(mu_datetime_dayofweek,mu_datetime_dayofyear)
(mu_datetime_year_days): New protos.
* libmailutils/Makefile.am (SUBDIRS): Add datetime
(libmailutils_la_LIBADD): Add libdatetime.la
* libmailutils/base/Makefile.am (libbase_la_SOURCES): Remove date.c
and strftime.c.
* libmailutils/base/date.c: Remove.
* libmailutils/base/strftime.c: Move to libmailutils/datetime
* libmailutils/datetime/Makefile.am: New file.
* libmailutils/datetime/dow.c: New file.
* libmailutils/datetime/doy.c: New file.
* libmailutils/datetime/jd.c: New file.
* libmailutils/datetime/scantime.c: New file.
* libmailutils/datetime/streamftime.c: New file.
* libmailutils/datetime/tab.c: New file.
* libmailutils/datetime/unixtime.c: New file.
* libmailutils/datetime/utcoff.c: New file.
* libmailutils/datetime/yd.c: New file.
* libmailutils/tests/scantime.at: Fix yday numbers.
Diffstat (limited to 'libmailutils/tests/scantime.at')
-rw-r--r-- | libmailutils/tests/scantime.at | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/libmailutils/tests/scantime.at b/libmailutils/tests/scantime.at index 2db854087..a7a6f85be 100644 --- a/libmailutils/tests/scantime.at +++ b/libmailutils/tests/scantime.at @@ -34,30 +34,30 @@ SCANTIME([Envelope (From) time],[envelope], [%a %b %e %H:%M:%S %Y], [Tue May 3 13:25:26 2011 Fri Nov 11 11:55:01 2011], -[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=0 -sec=1,min=55,hour=11,mday=11,mon=10,year=111,wday=5,yday=315,tz=0 +[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=0 +sec=1,min=55,hour=11,mday=11,mon=10,year=111,wday=5,yday=314,tz=0 ]) SCANTIME([IMAP INTERNALDATE],[imap-internaldate], [%d-%b-%Y %H:%M:%S %z], [03-May-2011 13:25:26 +0100 11-Nov-2011 11:55:01 +0100], -[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=3600 -sec=1,min=55,hour=11,mday=11,mon=10,year=111,wday=5,yday=315,tz=3600 +[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=3600 +sec=1,min=55,hour=11,mday=11,mon=10,year=111,wday=5,yday=314,tz=3600 ]) SCANTIME([IMAP INTERNALDATE (optional time)],[imap-search], [%d-%b-%Y%$ %H:%M:%S %z], [03-May-2011 13:25:26 +0100 03-May-2011], -[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=3600 -sec=0,min=0,hour=0,mday=3,mon=4,year=111,wday=2,yday=123,tz=0 +[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=3600 +sec=0,min=0,hour=0,mday=3,mon=4,year=111,wday=2,yday=122,tz=0 ]) SCANTIME([RFC-822 Strict],[rfc822-strict], [%a, %d %b %Y %H:%M:%S %z], [Tue, 03 May 2011 13:25:26 +0200], -[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 +[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 ]) SCANTIME([RFC-822],[rfc822], @@ -66,10 +66,10 @@ SCANTIME([RFC-822],[rfc822], 03 May 2011 13:25:26 +0200 Tue, 03 May 2011 13:25 +0200 03 May 2011 13:25 +0200], -[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 -sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 -sec=0,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 -sec=0,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 +[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 +sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 +sec=0,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 +sec=0,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 ]) SCANTIME([Any char],[anychar], @@ -78,23 +78,23 @@ SCANTIME([Any char],[anychar], Tue: 03 May 2011 13:25:26 +0200 Tue; 03 May 2011 13:25:26 +0200 Tue 03 May 2011 13:25:26 +0200], -[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 -sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 -sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 -sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 +[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 +sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 +sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 +sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 ]) SCANTIME([Percent],[percent], [%d%%%b%%%Y %H:%M:%S %z], [03%May%2011 13:25:26 +0100], -[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=3600 +[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=3600 ]) SCANTIME([Fixed WS],[fixws], [%d-%b-%Y%\ %H:%M:%S %z], [03-May-2011 13:25:26 +0100 03-May-2011 13:25:26 +0100], -[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=3600 +[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=3600 ], [scantime: 2: parse failed near 13:25:26 +0100 ]) @@ -104,15 +104,15 @@ SCANTIME([endp return],[endp], [Tue, 03 May 2011 13:25:26 +0100 other data ], [# 1: stopped at other data -sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=3600 +sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=3600 ]) SCANTIME([Optional blocks],[opt], [[%[%a, %]%d %b %Y %H:%M:%S %z]], [Tue, 03 May 2011 13:25:26 +0200 03 May 2011 13:25:26 +0200], -[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 -sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 +[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 +sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 ]) SCANTIME([Nested optional blocks],[nested-opt], @@ -120,9 +120,9 @@ SCANTIME([Nested optional blocks],[nested-opt], [Tue, 03 May 2011 13:25:26 +0200 Tue 03 May 2011 13:25:26 +0200 03 May 2011 13:25:26 +0200], -[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 -sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 -sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 +[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 +sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 +sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 ]) SCANTIME([Optional alternatives],[opt-alt], @@ -131,9 +131,9 @@ SCANTIME([Optional alternatives],[opt-alt], Tue: 03 May 2011 13:25:26 +0200 Tue 03 May 2011 13:25:26 +0200 Tue; 03 May 2011 13:25:26 +0200], -[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 -sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 -sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 +[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 +sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 +sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 ], [scantime: 4: parse failed near ; 03 May 2011 13:25:26 +0200 ]) @@ -145,9 +145,9 @@ Tue: 03 May 2011 13:25:26 +0200 Tue/ 03 May 2011 13:25:26 +0200 Tue 03 May 2011 13:25:26 +0200 Tue; 03 May 2011 13:25:26 +0200], -[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 -sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 -sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=123,tz=7200 +[sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 +sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 +sec=26,min=25,hour=13,mday=3,mon=4,year=111,wday=2,yday=122,tz=7200 ], [scantime: 4: parse failed near 03 May 2011 13:25:26 +0200 scantime: 5: parse failed near ; 03 May 2011 13:25:26 +0200 |