 @@ -1,14 +1,14 @@
-/*	$NetBSD: strptime.c,v 1.45 2015/07/15 13:54:38 ginsbach Exp $	*/
+/*	$NetBSD: strptime.c,v 1.46 2015/07/20 14:37:11 ginsbach Exp $	*/
 /*-
  * Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code was contributed to The NetBSD Foundation by Klaus Klein.
  * Heavily optimised by David Laight
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,45 +21,49 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strptime.c,v 1.45 2015/07/15 13:54:38 ginsbach Exp $");
+__RCSID("$NetBSD: strptime.c,v 1.46 2015/07/20 14:37:11 ginsbach Exp $");
 #endif
 #include "namespace.h"
 #include <sys/localedef.h>
 #include <sys/types.h>
 #include <ctype.h>
 #include <locale.h>
 #include <string.h>
 #include <time.h>
 #include <tzfile.h>
 #include "private.h"
 #include "setlocale_local.h"
 #ifdef __weak_alias
 __weak_alias(strptime,_strptime)
 __weak_alias(strptime_l, _strptime_l)
 #endif
 static const u_char *conv_num(const unsigned char *, int *, uint, uint);
 static const u_char *find_string(const u_char *, int *, const char * const *,
 	const char * const *, int);
 #define _TIME_LOCALE(loc) \
     ((_TimeLocale *)((loc)->part_impl[(size_t)LC_TIME]))
 /*
  * We do not implement alternate representations. However, we always
  * check whether a given modifier is allowed for a certain conversion.
  */
 #define ALT_E			0x01
 #define ALT_O			0x02
 #define	LEGAL_ALT(x)		{ if (alt_format & ~(x)) return NULL; }
 #define	S_YEAR		(1 << 0)
 #define	S_MON		(1 << 1)
 @@ -73,32 +77,34 @@ __weak_alias(strptime_l, _strptime_l)
 #define HAVE_YDAY(s)	(s & S_YDAY)
 #define HAVE_YEAR(s)	(s & S_YEAR)
 static char gmt[] = { "GMT" };
 static char utc[] = { "UTC" };
 /* RFC-822/RFC-2822 */
 static const char * const nast[5] = {
        "EST",    "CST",    "MST",    "PST",    "\0\0\0"
 };
 static const char * const nadt[5] = {
        "EDT",    "CDT",    "MDT",    "PDT",    "\0\0\0"
 };
-static const u_char *conv_num(const unsigned char *, int *, uint, uint);
+/*
-static const u_char *find_string(const u_char *, int *, const char * const *,
+ * Table to determine the ordinal date for the start of a month.
-	const char * const *, int);
+ * Ref: http://en.wikipedia.org/wiki/ISO_week_date
  */
 static const int start_of_month[2][13] = {
 	/* non-leap year */
 	{ 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
 	/* leap year */
 	{ 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
 };
 /*
  * Calculate the week day of the first day of a year. Valid for
  * the Gregorian calendar, which began Sept 14, 1752 in the UK
  * and its colonies. Ref:
  * http://en.wikipedia.org/wiki/Determination_of_the_day_of_the_week
  */
 static int
 first_wday_of(int yr)
+{
 @@ -576,67 +582,75 @@ literal:
 			while (isspace(*bp))
 				bp++;
 			LEGAL_ALT(0);
 			continue;
 		default:	/* Unknown/unsupported conversion. */
 			return NULL;
+		}
+	}
 	if (!HAVE_YDAY(state) && HAVE_YEAR(state)) {
 		if (HAVE_MON(state) && HAVE_MDAY(state)) {
 			/* calculate day of year (ordinal date) */
 			tm->tm_yday =  start_of_month[isleap_sum(tm->tm_year,
 			    TM_YEAR_BASE)][tm->tm_mon] + (tm->tm_mday - 1);
 			state |= S_YDAY;
 		} else if (day_offset != -1) {
-			/* Set the date to the first Sunday (or Monday)
+			/*
 			 * Set the date to the first Sunday (or Monday)
 			 * of the specified week of the year.
 			 */
 			if (!HAVE_WDAY(state)) {
 				tm->tm_wday = day_offset;
 				state |= S_WDAY;
+			}
 			tm->tm_yday = (7 -
 			    first_wday_of(tm->tm_year + TM_YEAR_BASE) +
 			    day_offset) % 7 + (week_offset - 1) * 7 +
 			    tm->tm_wday  - day_offset;
 			state |= S_YDAY;
+		}
+	}
 	if (HAVE_YDAY(state) && HAVE_YEAR(state)) {
 		int isleap;
 		if (!HAVE_MON(state)) {
 			/* calculate month of day of year */
 			i = 0;
 			isleap = isleap_sum(tm->tm_year, TM_YEAR_BASE);
 			while (tm->tm_yday >= start_of_month[isleap][i])
 				i++;
 			if (i > 12) {
 				i = 1;
 				tm->tm_yday -= start_of_month[isleap][12];
 				tm->tm_year++;
+			}
 			tm->tm_mon = i - 1;
 			state |= S_MON;
+		}
 		if (!HAVE_MDAY(state)) {
 			/* calculate day of month */
 			isleap = isleap_sum(tm->tm_year, TM_YEAR_BASE);
 			tm->tm_mday = tm->tm_yday -
 			    start_of_month[isleap][tm->tm_mon] + 1;
 			state |= S_MDAY;
+		}
 		if (!HAVE_WDAY(state)) {
 			/* calculate day of week */
 			i = 0;
 			week_offset = first_wday_of(tm->tm_year);
 			while (i++ <= tm->tm_yday) {
 				if (week_offset++ >= 6)
 					week_offset = 0;
+			}
 			tm->tm_wday = week_offset;
 			state |= S_WDAY;
+		}
+	}
 	return __UNCONST(bp);
+}