18 files changed, 1416 insertions, 1197 deletions

diff --git a/configure.ac b/configure.ac
index 62b4409d1..dfacf09fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1470,6 +1470,7 @@ AC_CONFIG_FILES([
  libmailutils/sockaddr/Makefile
  libmailutils/cidr/Makefile
  libmailutils/cfg/Makefile
+ libmailutils/datetime/Makefile
  libmailutils/diag/Makefile
  libmailutils/filter/Makefile
  libmailutils/imapio/Makefile
diff --git a/include/mailutils/datetime.h b/include/mailutils/datetime.h
index 0ad84b595..de00618a0 100644
--- a/include/mailutils/datetime.h
+++ b/include/mailutils/datetime.h
@@ -24,6 +24,29 @@
   /* ----------------------- */
   /* Date & time functions   */
   /* ----------------------- */
+
+/* Argument ranges:
+
+   year != 0, AD if > 0, BC if < 0
+   1 <= month <= 12
+   1 <= day <= maxday(month)
+*/
+/* Compute Julian Day for the given date */
+int mu_datetime_julianday (int year, int month, int day);
+/* Compute day of week (Sunday - 0) */
+int mu_datetime_dayofweek (int year, int month, int day);
+/* Compute ordinal date (1-based) */
+int mu_datetime_dayofyear (int year, int month, int day);
+/* Return number of days in the year */
+int mu_datetime_year_days (int year);
+
+/* Day of week and month names in C locale */
+extern const char *_mu_datetime_short_month[];
+extern const char *_mu_datetime_full_month[];
+extern const char *_mu_datetime_short_wday[];
+extern const char *_mu_datetime_full_wday[];
+
+
 struct mu_timezone
 {
   int utc_offset;  /* Seconds east of UTC. */
diff --git a/libmailutils/Makefile.am b/libmailutils/Makefile.am
index b32138250..c01b32176 100644
--- a/libmailutils/Makefile.am
+++ b/libmailutils/Makefile.am
@@ -19,7 +19,7 @@
 SUBDIRS = \
  auth base address list sockaddr cidr cfg diag\
  filter mailbox mailer mime server string stream stdstream\
- property url imapio . tests 
+ property url imapio datetime . tests 
 
 lib_LTLIBRARIES = libmailutils.la
 
@@ -33,6 +33,7 @@ libmailutils_la_LIBADD = \
  sockaddr/libsockaddr.la\
  cidr/libcidr.la\
  cfg/libcfg.la\
+ datetime/libdatetime.la\
  diag/libdiag.la\
  filter/libfilter.la\
  imapio/libimapio.la\
diff --git a/libmailutils/base/Makefile.am b/libmailutils/base/Makefile.am
index a2e5ac5b6..4b9a3759d 100644
--- a/libmailutils/base/Makefile.am
+++ b/libmailutils/base/Makefile.am
@@ -26,7 +26,6 @@ libbase_la_SOURCES = \
  assoc.c\
  filesafety.c\
  daemon.c\
- date.c\
  fdwait.c\
  fgetpwent.c\
  filename.c\
@@ -61,7 +60,6 @@ libbase_la_SOURCES = \
  sha1.c\
  secret.c\
  spawnvp.c\
- strftime.c\
  symlink.c\
  tempfile.c\
  ticket.c\
diff --git a/libmailutils/base/date.c b/libmailutils/base/date.c
deleted file mode 100644
index b3182538d..000000000
--- a/libmailutils/base/date.c
+++ /dev/null
@@ -1,1163 +0,0 @@
-/* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2000, 2001, 2002, 2007, 2009, 2010, 2011 Free
-   Software Foundation, Inc.
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 3 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General
-   Public License along with this library.  If not, see
-   <http://www.gnu.org/licenses/>. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mailutils/diag.h>
-#include <mailutils/datetime.h>
-#include <mailutils/util.h>
-#include <mailutils/stream.h>
-#include <mailutils/errno.h>
-#include <mailutils/cstr.h>
-#include <mailutils/cctype.h>
-
-#define SECS_PER_DAY 86400
-#define ADJUSTMENT -719162L
-
-/* Julian day is the number of days since Jan 1, 4713 BC (ouch!).
-   Eg. Jan 1, 1900 is: */
-#define  JULIAN_1900    1721425L
-
-/* Computes the number of days elapsed since January, 1 1900 to the
-   January, 1 of the given year */
-static unsigned
-jan1st (int year)
-{
-  year--;               /* Do not consider the current year */
-  return  year * 365L
-               + year/4L    /* Years divisible by 4 are leap years */
-               + year/400L  /* Years divisible by 400 are always leap years */
-               - year/100L; /* Years divisible by 100 but not 400 aren't */
-}
-
-static int  month_start[]=
-    {    0, 31, 59,  90, 120, 151, 181, 212, 243, 273, 304, 334, 365 };
-     /* Jan Feb Mar  Apr  May  Jun  Jul  Aug  Sep  Oct  Nov  Dec
-         31  28  31   30   31   30   31   31   30   31   30   31
-     */
-
-#define leap_year(y) ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0))
-
-static int
-dayofyear (int year, int month, int day)
-{
-  int  leap, month_days;
-
-  if (year < 0 || month < 0 || month > 11)
-    return -1;
-    
-  leap = leap_year (year);
-  
-  month_days = month_start[month + 1] - month_start[month]
-               + ((month == 2) ? leap : 0);
-
-  if (day < 0 || day > month_days)
-    return -1;  /* Illegal Date */
-
-  if (month <= 2)
-    leap = 0;
-
-  return month_start[month] + day + leap;
-}
-
-/* Returns number of days in a given year */
-static int
-year_days (int year)
-{
-  return dayofyear (year, 11, 31);
-}
-
-static int
-julianday (unsigned *pd, int year, int month, int day)
-{
-  int total = dayofyear (year, month, day);
-  if (total == -1)
-    return -1;
-  *pd = JULIAN_1900 + total + jan1st (year);
-  return 0;
-}
-
-static int
-dayofweek (int year, int month, int day)
-{
-  unsigned jd;
-
-  if (julianday (&jd, year, month, day))
-    return -1;
-
-  /* January 1, 1900 was Monday, hence +1 */
-  return (jd + 1) % 7;
-}
-
-#define ISO_8601_START_WDAY 1 /* Monday */
-#define ISO_8601_MAX_WDAY   4 /* Thursday */
-#define MAXDAYS 366 /* Max. number of days in a year */
-#define ISO_8601_OFF ((MAXDAYS / 7 + 2) * 7)