@@ -166,8 +166,9 @@ static int download(const struct optstruct *opts, const char *datadir, const cha

     } else {

 	while(opt) {

 	    ret = downloadmanager(opts, opt->strarg, datadir, try == maxattempts - 1);

+#ifndef _WIN32

 	    alarm(0);

-

+#endif

 	    if(ret == 52 || ret == 54 || ret == 58 || ret == 59) {

 		if(try < maxattempts - 1) {

 		    logg("Trying again in 5 secs...\n");

@@ -199,7 +200,7 @@ int main(int argc, char **argv)

 	char *pt;

 	struct optstruct *opts;

 	const struct optstruct *opt;

-#ifndef	C_WINDOWS

+#ifndef	_WIN32

 	struct sigaction sigact;

 	struct sigaction oldact;

 #endif

@@ -297,7 +298,7 @@ int main(int argc, char **argv)

 	    return 61;

 	}

     }

-#endif

+#endif /* HAVE_PWD_H */

     /* initialize some important variables */

@@ -373,7 +374,7 @@ int main(int argc, char **argv)

     if(optget(opts, "daemon")->enabled) {

 	    int bigsleep, checks;

-#ifndef	C_WINDOWS

+#ifndef	_WIN32

 	    time_t now, wakeup;

 	memset(&sigact, 0, sizeof(struct sigaction));

@@ -211,7 +211,7 @@ static int wwwconnect(const char *server, const char *proxy, int pport, char *ip

 		else

 			port = 8080;

-#ifndef	C_WINDOWS

+#ifndef	_WIN32

 		endservent();

 #endif

 	}

@@ -16,6 +16,9 @@ EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclamunrar", "libclamunrar.vcproj", "{41B2E193-92E3-429C-8DAC-9B287E3D7182}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freshclam", "freshclam.vcproj", "{CEA52DD8-0418-42AD-B640-F33CC7C600CE}"

+	ProjectSection(ProjectDependencies) = postProject

+		{3AD5B16C-340A-40AC-96AD-6017B941A316} = {3AD5B16C-340A-40AC-96AD-6017B941A316}

+	EndProjectSection

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -40,6 +43,7 @@ Global

 		{41B2E193-92E3-429C-8DAC-9B287E3D7182}.Release|Win32.ActiveCfg = Release|Win32

 		{41B2E193-92E3-429C-8DAC-9B287E3D7182}.Release|Win32.Build.0 = Release|Win32

 		{CEA52DD8-0418-42AD-B640-F33CC7C600CE}.Debug|Win32.ActiveCfg = Debug|Win32

+		{CEA52DD8-0418-42AD-B640-F33CC7C600CE}.Debug|Win32.Build.0 = Debug|Win32

 		{CEA52DD8-0418-42AD-B640-F33CC7C600CE}.Release|Win32.ActiveCfg = Release|Win32

 		{CEA52DD8-0418-42AD-B640-F33CC7C600CE}.Release|Win32.Build.0 = Release|Win32

 	EndGlobalSection

@@ -188,20 +188,11 @@

 /* have getaddrinfo() */

 #define HAVE_GETADDRINFO 1

-/* gethostbyname_r takes 3 arguments */

-/* #undef HAVE_GETHOSTBYNAME_R_3 */

-

-/* gethostbyname_r takes 5 arguments */

-/* #undef HAVE_GETHOSTBYNAME_R_5 */

-

-/* gethostbyname_r takes 6 arguments */

-#define HAVE_GETHOSTBYNAME_R_6 1

-

 /* Define to 1 if getpagesize() is available */

 #define HAVE_GETPAGESIZE 1

 /* Define to 1 if you have the <grp.h> header file. */

-#define HAVE_GRP_H 1

+/* #undef HAVE_GRP_H */

 /* iconv() available */

 /* #undef HAVE_ICONV 1 */

@@ -313,7 +304,7 @@

 #define HAVE_RECVMSG 1

 /* have resolv.h */

-#define HAVE_RESOLV_H 1

+/* #undef HAVE_RESOLV_H */

 /* Define signed right shift implementation */

 #define HAVE_SAR 1

new file mode 100644

@@ -0,0 +1,32 @@

+/* just a draft for now */

+

+#if HAVE_CONFIG_H

+#include "clamav-config.h"

+#endif

+

+#include "pthread.h"

+

+BOOL APIENTRY DllMain(HMODULE hm, DWORD why, LPVOID rsrv) {

+    WSADATA wsa;

+    switch (why) {

+    case DLL_PROCESS_ATTACH:

+	if(WSAStartup(MAKEWORD(2,2), &wsa))

+	    return FALSE;

+	return pthread_win32_process_attach_np();

+	break;

+

+    case DLL_THREAD_ATTACH:

+	return pthread_win32_thread_attach_np ();

+	break;

+

+    case DLL_THREAD_DETACH:

+	return pthread_win32_thread_detach_np ();

+	break;

+

+    case DLL_PROCESS_DETACH:

+	WSACleanup();

+	pthread_win32_thread_detach_np ();

+	return pthread_win32_process_detach_np ();

+	break;

+    }

+}

@@ -1,4 +1,6 @@

 #include <winsock2.h>

+#include <Ws2tcpip.h>

+#include "net.h"

 #include "w32_errno.h"

 static void wsock2errno() {

@@ -187,36 +189,100 @@ static void wsock2errno() {

     }

 }

-int w32_send(int sockfd, const void *buf, size_t len, int flags) {

-    int ret;

-    if(WSASend((SOCKET)sockfd, (LPWSABUF)buf, (DWORD)len, (LPDWORD)&ret, (DWORD)flags, NULL, NULL)) {

+int w32_socket(int domain, int type, int protocol) {

+    SOCKET s = socket(domain, type, protocol);

+    if(s == INVALID_SOCKET) {

 	wsock2errno();

 	return -1;

     }

-    return ret;

+    return (int)s;

 }

-/*

-int w32_gethostbyname(const char *name) {

-    struct hostent *h = gethostbyname(name);

-    h_errno = 0;

-    if(!h) {

-	switch(WSAGetLastError()) {

-	    case WSAHOST_NOT_FOUND:

-		*h_errno = HOST_NOT_FOUND;

-		break;

-	    case WSATRY_AGAIN:

-		*h_errno = TRY_AGAIN;

-		break;

-	    case WSANO_RECOVERY:

-		*h_errno = NO_RECOVERY;

-		break;

-	    case WSANO_DATA:

-		*h_errno = NO_DATA;

-		break;

-	}

+int w32_getsockopt(int sockfd, int level, int optname, void *optval, socklen_t *optlen) {

+    if(getsockopt((SOCKET)sockfd, level, optname, (char *)optval, optlen) == SOCKET_ERROR) {

+	wsock2errno();

+	return -1;

+    }

+    return 0;

+}

+

+int w32_setsockopt(int sockfd, int level, int optname, const void *optval, socklen_t optlen) {

+    if(setsockopt((SOCKET)sockfd, level, optname, (const char*)optval, optlen) == SOCKET_ERROR) {

+	wsock2errno();

+	return -1;

+    }

+    return 0;

+}

+

+int w32_bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen) {

+    if(bind((SOCKET)sockfd, addr, addrlen) == SOCKET_ERROR) {

+	wsock2errno();

+	return -1;

     }

-    return h;

+    return 0;

 }

-*/

\ No newline at end of file

+int w32_connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen) {

+    if(connect((SOCKET)sockfd, addr, addrlen)) {

+	wsock2errno();

+	return -1;

+    }

+    return 0;

+}

+

+ssize_t w32_send(int sockfd, const void *buf, size_t len, int flags) {

+    int ret = recv((SOCKET)sockfd, (const char *)buf, (int)len, flags);

+    if(ret == SOCKET_ERROR) {

+	wsock2errno();

+	return -1;

+    }

+    return (ssize_t)ret;

+}

+

+ssize_t w32_recv(int sockfd, void *buf, size_t len, int flags) {

+    int ret = recv((SOCKET)sockfd, (char *)buf, len, flags);

+    if(ret == SOCKET_ERROR) {

+	wsock2errno();

+	return -1;

+    }

+    return (ssize_t)ret;

+}

+

+int w32_closesocket(int sockfd) {

+    if(closesocket((SOCKET)sockfd) == SOCKET_ERROR) {

+	wsock2errno();

+	return -1;

+    }

+    return 0;

+}

+

+struct servent *w32_getservbyname(const char *name, const char *proto) {

+    return getservbyname(name, proto);

+}

+

+int w32_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res) {

+    return getaddrinfo(node, service, hints, res);

+}

+

+void w32_freeaddrinfo(struct addrinfo *res) {

+    freeaddrinfo(res);

+}

+

+const char *w32_inet_ntop(int af, const void *src, char *dst, socklen_t size) {

+    const char *ret = inet_ntoa(*(struct in_addr *)src);

+    if(!ret) wsock2errno();

+    return ret;

+}

+

+struct hostent *w32_gethostbyname(const char *name) {

+    return gethostbyname(name);

+}

+

+int w32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout) {

+    int ret = select(nfds, readfds, writefds, exceptfds, timeout);

+    if(ret == SOCKET_ERROR) {

+	wsock2errno();

+	return -1;

+    }

+    return ret;

+}

@@ -21,6 +21,22 @@

 #ifndef __NET_H

 #define __NET_H

-int w32_send(int sockfd, const void *buf, size_t len, int flags);

+typedef int socklen_t;

+typedef int ssize_t;

+

+int w32_socket(int domain, int type, int protocol);

+int w32_getsockopt(int sockfd, int level, int optname, void *optval, socklen_t *optlen);

+int w32_setsockopt(int sockfd, int level, int optname, const void *optval, socklen_t optlen);

+int w32_bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen);

+int w32_connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen);

+ssize_t w32_send(int sockfd, const void *buf, size_t len, int flags);

+ssize_t w32_recv(int sockfd, void *buf, size_t len, int flags);

+int w32_closesocket(int sockfd);

+struct servent *w32_getservbyname(const char *name, const char *proto);

+int w32_getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res);

+void w32_freeaddrinfo(struct addrinfo *res);

+const char *w32_inet_ntop(int af, const void *src, char *dst, socklen_t size);

+struct hostent *w32_gethostbyname(const char *name);

+int w32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout);

 #endif

new file mode 100644

@@ -0,0 +1,1149 @@

+/* Copyright (C) 2002, 2004, 2005, 2007 Free Software Foundation, Inc.

+   This file is part of the GNU C Library.

+

+   This program is free software; you can redistribute it and/or modify

+   it under the terms of the GNU General Public License as published by

+   the Free Software Foundation; either version 2, or (at your option)

+   any later version.

+

+   This program 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 General Public License for more details.

+

+   You should have received a copy of the GNU General Public License along

+   with this program; if not, write to the Free Software Foundation,

+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */

+

+

+/* Minor modifications by acab@clamav.net */

+

+#define strncasecmp strnicmp

+#ifndef _LIBC

+//# include <config.h>

+#endif

+

+#include <time.h>

+

+#include <assert.h>

+#include <ctype.h>

+#ifdef _LIBC

+# include <langinfo.h>

+#endif

+#include <limits.h>

+#include <string.h>

+//#include <stdbool.h>

+

+#ifdef _LIBC

+# include "../locale/localeinfo.h"

+#endif

+

+#ifndef _LIBC

+enum ptime_locale_status { not, loc, raw };

+#endif

+

+struct tm *localtime_r(time_t const *t, struct tm *tp) {

+    struct tm *copy = localtime(t);

+    if(!copy) return NULL;

+    memcpy(tp, copy, sizeof(*tp));

+    return tp;

+}

+

+typedef int bool;

+

+#define match_char(ch1, ch2) if (ch1 != ch2) return NULL

+#if defined _LIBC && defined __GNUC__ && __GNUC__ >= 2

+# define match_string(cs1, s2) \

+  ({ size_t len = strlen (cs1);						      \

+     int result = __strncasecmp_l ((cs1), (s2), len, locale) == 0;	      \

+     if (result) (s2) += len;						      \

+     result; })

+#else

+/* Oh come on.  Get a reasonable compiler.  */

+# define match_string(cs1, s2) \

+  (strncasecmp ((cs1), (s2), strlen (cs1)) ? 0 : ((s2) += strlen (cs1), 1))

+#endif

+/* We intentionally do not use isdigit() for testing because this will

+   lead to problems with the wide character version.  */

+#define get_number(from, to, n) \

+  do {									      \

+    int __n = n;							      \

+    val = 0;								      \

+    while (*rp == ' ')							      \

+      ++rp;								      \

+    if (*rp < '0' || *rp > '9')						      \

+      return NULL;							      \

+    do {								      \

+      val *= 10;							      \

+      val += *rp++ - '0';						      \

+    } while (--__n > 0 && val * 10 <= to && *rp >= '0' && *rp <= '9');	      \

+    if (val < from || val > to)						      \

+      return NULL;							      \

+  } while (0)

+#ifdef _NL_CURRENT

+# define get_alt_number(from, to, n) \

+  ({									      \

+     __label__ do_normal;						      \

+									      \

+     if (*decided != raw)						      \

+       {								      \

+	 val = _nl_parse_alt_digit (&rp HELPER_LOCALE_ARG);		      \

+	 if (val == -1 && *decided != loc)				      \

+	   {								      \

+	     *decided = loc;						      \

+	     goto do_normal;						      \

+	   }								      \

+	if (val < from || val > to)					      \

+	  return NULL;							      \

+       }								      \

+     else								      \

+       {								      \

+       do_normal:							      \

+	 get_number (from, to, n);					      \

+       }								      \

+    0;									      \

+  })

+#else

+# define get_alt_number(from, to, n) \

+  /* We don't have the alternate representation.  */			      \

+  get_number(from, to, n)

+#endif

+#define recursive(new_fmt) \

+  (*(new_fmt) != '\0'							      \

+   && (rp = __strptime_internal (rp, (new_fmt), tm,			      \

+				 decided, era_cnt LOCALE_ARG)) != NULL)

+

+

+#ifdef _LIBC

+/* This is defined in locale/C-time.c in the GNU libc.  */

+extern const struct locale_data _nl_C_LC_TIME attribute_hidden;

+

+# define weekday_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (DAY_1)].string)

+# define ab_weekday_name \

+  (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABDAY_1)].string)

+# define month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (MON_1)].string)

+# define ab_month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABMON_1)].string)

+# define HERE_D_T_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_T_FMT)].string)

+# define HERE_D_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_FMT)].string)

+# define HERE_AM_STR (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (AM_STR)].string)

+# define HERE_PM_STR (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (PM_STR)].string)

+# define HERE_T_FMT_AMPM \

+  (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (T_FMT_AMPM)].string)

+# define HERE_T_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (T_FMT)].string)

+

+# define strncasecmp(s1, s2, n) __strncasecmp (s1, s2, n)

+#else

+static char const weekday_name[][10] =

+  {

+    "Sunday", "Monday", "Tuesday", "Wednesday",

+    "Thursday", "Friday", "Saturday"

+  };

+static char const ab_weekday_name[][4] =

+  {

+    "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"

+  };

+static char const month_name[][10] =

+  {

+    "January", "February", "March", "April", "May", "June",

+    "July", "August", "September", "October", "November", "December"

+  };

+static char const ab_month_name[][4] =

+  {

+    "Jan", "Feb", "Mar", "Apr", "May", "Jun",

+    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"

+  };

+# define HERE_D_T_FMT "%a %b %e %H:%M:%S %Y"

+# define HERE_D_FMT "%m/%d/%y"

+# define HERE_AM_STR "AM"

+# define HERE_PM_STR "PM"

+# define HERE_T_FMT_AMPM "%I:%M:%S %p"

+# define HERE_T_FMT "%H:%M:%S"

+

+static const unsigned short int __mon_yday[2][13] =

+  {

+    /* Normal years.  */

+    { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },

+    /* Leap years.  */

+    { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }

+  };

+#endif

+

+#if defined _LIBC

+/* We use this code also for the extended locale handling where the

+   function gets as an additional argument the locale which has to be

+   used.  To access the values we have to redefine the _NL_CURRENT

+   macro.  */

+# define strptime		__strptime_l

+# undef _NL_CURRENT

+# define _NL_CURRENT(category, item) \

+  (current->values[_NL_ITEM_INDEX (item)].string)

+# undef _NL_CURRENT_WORD

+# define _NL_CURRENT_WORD(category, item) \

+  (current->values[_NL_ITEM_INDEX (item)].word)

+# define LOCALE_PARAM , locale

+# define LOCALE_ARG , locale

+# define LOCALE_PARAM_PROTO , __locale_t locale

+# define LOCALE_PARAM_DECL __locale_t locale;

+# define HELPER_LOCALE_ARG , current

+# define ISSPACE(Ch) __isspace_l (Ch, locale)

+#else

+# define LOCALE_PARAM

+# define LOCALE_ARG

+# define LOCALE_PARAM_DECL

+# define LOCALE_PARAM_PROTO

+# define HELPER_LOCALE_ARG

+# define ISSPACE(Ch) isspace (Ch)

+#endif

+

+

+

+

+#ifndef __isleap

+/* Nonzero if YEAR is a leap year (every 4 years,

+   except every 100th isn't, and every 400th is).  */

+# define __isleap(year)	\

+  ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))

+#endif

+

+/* Compute the day of the week.  */

+static void

+day_of_the_week (struct tm *tm)

+{

+  /* We know that January 1st 1970 was a Thursday (= 4).  Compute the

+     the difference between this data in the one on TM and so determine

+     the weekday.  */

+  int corr_year = 1900 + tm->tm_year - (tm->tm_mon < 2);

+  int wday = (-473

+	      + (365 * (tm->tm_year - 70))

+	      + (corr_year / 4)

+	      - ((corr_year / 4) / 25) + ((corr_year / 4) % 25 < 0)

+	      + (((corr_year / 4) / 25) / 4)

+	      + __mon_yday[0][tm->tm_mon]

+	      + tm->tm_mday - 1);

+  tm->tm_wday = ((wday % 7) + 7) % 7;

+}

+

+/* Compute the day of the year.  */

+static void

+day_of_the_year (struct tm *tm)

+{

+  tm->tm_yday = (__mon_yday[__isleap (1900 + tm->tm_year)][tm->tm_mon]

+		 + (tm->tm_mday - 1));

+}

+

+

+#ifdef _LIBC

+char *

+internal_function

+#else

+static char *

+#endif

+__strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM)

+     const char *rp;

+     const char *fmt;

+     struct tm *tm;

+     enum ptime_locale_status *decided;

+     int era_cnt;

+     LOCALE_PARAM_DECL

+{

+#ifdef _LIBC

+  struct locale_data *const current = locale->__locales[LC_TIME];

+#endif

+

+  const char *rp_backup;

+  int cnt;

+  size_t val;

+  int have_I, is_pm;

+  int century, want_century;

+  int want_era;

+  int have_wday, want_xday;

+  int have_yday;

+  int have_mon, have_mday;

+  int have_uweek, have_wweek;

+  int week_no;

+  size_t num_eras;

+  struct era_entry *era;

+

+  have_I = is_pm = 0;

+  century = -1;

+  want_century = 0;

+  want_era = 0;

+  era = NULL;

+  week_no = 0;

+

+  have_wday = want_xday = have_yday = have_mon = have_mday = have_uweek = 0;

+  have_wweek = 0;

+

+  while (*fmt != '\0')

+    {

+      /* A white space in the format string matches 0 more or white

+	 space in the input string.  */

+      if (ISSPACE (*fmt))

+	{

+	  while (ISSPACE (*rp))

+	    ++rp;

+	  ++fmt;

+	  continue;

+	}

+

+      /* Any character but `%' must be matched by the same character

+	 in the iput string.  */

+      if (*fmt != '%')

+	{

+	  match_char (*fmt++, *rp++);

+	  continue;

+	}

+

+      ++fmt;

+#ifndef _NL_CURRENT

+      /* We need this for handling the `E' modifier.  */

+    start_over:

+#endif

+

+      /* Make back up of current processing pointer.  */

+      rp_backup = rp;

+

+      switch (*fmt++)

+	{

+	case '%':

+	  /* Match the `%' character itself.  */

+	  match_char ('%', *rp++);

+	  break;

+	case 'a':

+	case 'A':

+	  /* Match day of week.  */

+	  for (cnt = 0; cnt < 7; ++cnt)

+	    {

+#ifdef _NL_CURRENT

+	      if (*decided !=raw)

+		{

+		  if (match_string (_NL_CURRENT (LC_TIME, DAY_1 + cnt), rp))

+		    {

+		      if (*decided == not

+			  && strcmp (_NL_CURRENT (LC_TIME, DAY_1 + cnt),

+				     weekday_name[cnt]))

+			*decided = loc;

+		      break;

+		    }

+		  if (match_string (_NL_CURRENT (LC_TIME, ABDAY_1 + cnt), rp))

+		    {

+		      if (*decided == not

+			  && strcmp (_NL_CURRENT (LC_TIME, ABDAY_1 + cnt),

+				     ab_weekday_name[cnt]))

+			*decided = loc;

+		      break;

+		    }

+		}

+#endif

+	      if (*decided != loc

+		  && (match_string (weekday_name[cnt], rp)

+		      || match_string (ab_weekday_name[cnt], rp)))

+		{

+		  *decided = raw;

+		  break;

+		}

+	    }

+	  if (cnt == 7)

+	    /* Does not match a weekday name.  */

+	    return NULL;

+	  tm->tm_wday = cnt;

+	  have_wday = 1;

+	  break;

+	case 'b':

+	case 'B':

+	case 'h':

+	  /* Match month name.  */

+	  for (cnt = 0; cnt < 12; ++cnt)

+	    {

+#ifdef _NL_CURRENT

+	      if (*decided !=raw)

+		{

+		  if (match_string (_NL_CURRENT (LC_TIME, MON_1 + cnt), rp))

+		    {

+		      if (*decided == not

+			  && strcmp (_NL_CURRENT (LC_TIME, MON_1 + cnt),

+				     month_name[cnt]))

+			*decided = loc;

+		      break;

+		    }

+		  if (match_string (_NL_CURRENT (LC_TIME, ABMON_1 + cnt), rp))

+		    {

+		      if (*decided == not

+			  && strcmp (_NL_CURRENT (LC_TIME, ABMON_1 + cnt),

+				     ab_month_name[cnt]))

+			*decided = loc;

+		      break;

+		    }

+		}

+#endif

+	      if (match_string (month_name[cnt], rp)

+		  || match_string (ab_month_name[cnt], rp))

+		{

+		  *decided = raw;

+		  break;

+		}

+	    }

+	  if (cnt == 12)

+	    /* Does not match a month name.  */

+	    return NULL;

+	  tm->tm_mon = cnt;

+	  want_xday = 1;

+	  break;

+	case 'c':

+	  /* Match locale's date and time format.  */

+#ifdef _NL_CURRENT

+	  if (*decided != raw)

+	    {

+	      if (!recursive (_NL_CURRENT (LC_TIME, D_T_FMT)))

+		{

+		  if (*decided == loc)

+		    return NULL;

+		  else

+		    rp = rp_backup;

+		}

+	      else

+		{

+		  if (*decided == not &&

+		      strcmp (_NL_CURRENT (LC_TIME, D_T_FMT), HERE_D_T_FMT))

+		    *decided = loc;

+		  want_xday = 1;

+		  break;

+		}

+	      *decided = raw;

+	    }

+#endif

+	  if (!recursive (HERE_D_T_FMT))

+	    return NULL;

+	  want_xday = 1;

+	  break;

+	case 'C':

+	  /* Match century number.  */

+	match_century:

+	  get_number (0, 99, 2);

+	  century = val;

+	  want_xday = 1;

+	  break;

+	case 'd':

+	case 'e':

+	  /* Match day of month.  */

+	  get_number (1, 31, 2);

+	  tm->tm_mday = val;

+	  have_mday = 1;

+	  want_xday = 1;

+	  break;

+	case 'F':

+	  if (!recursive ("%Y-%m-%d"))

+	    return NULL;

+	  want_xday = 1;

+	  break;

+	case 'x':

+#ifdef _NL_CURRENT

+	  if (*decided != raw)

+	    {

+	      if (!recursive (_NL_CURRENT (LC_TIME, D_FMT)))

+		{

+		  if (*decided == loc)

+		    return NULL;

+		  else

+		    rp = rp_backup;

+		}

+	      else

+		{

+		  if (*decided == not

+		      && strcmp (_NL_CURRENT (LC_TIME, D_FMT), HERE_D_FMT))

+		    *decided = loc;

+		  want_xday = 1;

+		  break;

+		}

+	      *decided = raw;

+	    }

+#endif

+	  /* Fall through.  */

+	case 'D':

+	  /* Match standard day format.  */

+	  if (!recursive (HERE_D_FMT))

+	    return NULL;

+	  want_xday = 1;

+	  break;

+	case 'k':

+	case 'H':

+	  /* Match hour in 24-hour clock.  */

+	  get_number (0, 23, 2);

+	  tm->tm_hour = val;

+	  have_I = 0;

+	  break;

+	case 'l':

+	  /* Match hour in 12-hour clock.  GNU extension.  */

+	case 'I':

+	  /* Match hour in 12-hour clock.  */

+	  get_number (1, 12, 2);

+	  tm->tm_hour = val % 12;

+	  have_I = 1;

+	  break;

+	case 'j':

+	  /* Match day number of year.  */

+	  get_number (1, 366, 3);

+	  tm->tm_yday = val - 1;

+	  have_yday = 1;

+	  break;

+	case 'm':

+	  /* Match number of month.  */

+	  get_number (1, 12, 2);

+	  tm->tm_mon = val - 1;

+	  have_mon = 1;

+	  want_xday = 1;

+	  break;

+	case 'M':

+	  /* Match minute.  */

+	  get_number (0, 59, 2);

+	  tm->tm_min = val;

+	  break;

+	case 'n':

+	case 't':

+	  /* Match any white space.  */

+	  while (ISSPACE (*rp))

+	    ++rp;

+	  break;

+	case 'p':

+	  /* Match locale's equivalent of AM/PM.  */

+#ifdef _NL_CURRENT

+	  if (*decided != raw)

+	    {

+	      if (match_string (_NL_CURRENT (LC_TIME, AM_STR), rp))

+		{

+		  if (strcmp (_NL_CURRENT (LC_TIME, AM_STR), HERE_AM_STR))

+		    *decided = loc;

+		  break;

+		}

+	      if (match_string (_NL_CURRENT (LC_TIME, PM_STR), rp))

+		{

+		  if (strcmp (_NL_CURRENT (LC_TIME, PM_STR), HERE_PM_STR))

+		    *decided = loc;

+		  is_pm = 1;

+		  break;

+		}

+	      *decided = raw;

+	    }

+#endif

+	  if (!match_string (HERE_AM_STR, rp))

+	    {

+	      if (match_string (HERE_PM_STR, rp))

+		is_pm = 1;

+	      else

+		return NULL;

+	    }

+	  break;

+	case 'r':

+#ifdef _NL_CURRENT

+	  if (*decided != raw)

+	    {

+	      if (!recursive (_NL_CURRENT (LC_TIME, T_FMT_AMPM)))

+		{

+		  if (*decided == loc)

+		    return NULL;

+		  else

+		    rp = rp_backup;

+		}

+	      else

+		{

+		  if (*decided == not &&

+		      strcmp (_NL_CURRENT (LC_TIME, T_FMT_AMPM),

+			      HERE_T_FMT_AMPM))

+		    *decided = loc;

+		  break;

+		}

+	      *decided = raw;

+	    }

+#endif

+	  if (!recursive (HERE_T_FMT_AMPM))

+	    return NULL;

+	  break;

+	case 'R':

+	  if (!recursive ("%H:%M"))

+	    return NULL;

+	  break;

+	case 's':

+	  {

+	    /* The number of seconds may be very high so we cannot use

+	       the `get_number' macro.  Instead read the number

+	       character for character and construct the result while

+	       doing this.  */

+	    time_t secs = 0;

+	    if (*rp < '0' || *rp > '9')

+	      /* We need at least one digit.  */

+	      return NULL;

+

+	    do

+	      {

+		secs *= 10;

+		secs += *rp++ - '0';

+	      }

+	    while (*rp >= '0' && *rp <= '9');

+

+	    if (localtime_r (&secs, tm) == NULL)