 @@ -1,14 +1,14 @@
-.\"	$NetBSD: strptime.3,v 1.23 2009/03/09 19:24:27 joerg Exp $
+.\"	$NetBSD: strptime.3,v 1.24 2009/05/01 20:15:05 ginsbach Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This file was contributed to The NetBSD Foundation by Klaus Klein.
 .\"
 .\" 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.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 @@ -16,27 +16,27 @@
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 .\" 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.
 .\"
-.Dd November 4, 2008
+.Dd April 30, 2009
 .Dt STRPTIME 3
 .Os
 .Sh NAME
 .Nm strptime
 .Nd converts a character string to a time value
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
 .In time.h
 .Ft char *
 .Fn strptime "const char * restrict buf" "const char * restrict format" "struct tm * restrict tm"
 .Sh DESCRIPTION
 The
 @@ -178,60 +178,109 @@ extension.
 .It Cm \&%U
 the week number of the year (Sunday as the first day of the week)
 as a decimal number [0,53];
 leading zeros are permitted but not required.
 All days in a year preceding the first Sunday are considered to be in week 0.
 .It Cm \&%V
 the ISO 8601:1988 week number as a decimal number.
 If the week (starting on Monday) that contains January 1 has more than
 three days in the new year, then it is considered the first week of the
 year.
 If it has fewer than four days in the new year, then it is considered
 the last week of the previous year.
 Weeks are numbered from 1 to 53.
 .Po
+A
 .Nx
 extension.
 .Pc
 .It Cm \&%w
 the weekday as a decimal number [0,6], with 0 representing Sunday;
 leading zeros are permitted but not required.
 .It Cm \&%W
 the week number of the year (Monday as the first day of the week)
 as a decimal number [0,53];
 leading zeros are permitted but not required.
 All days in a year preceding the first Monday are considered to be in week 0.
 .It Cm \&%x
 the date, using the locale's date format.
 .It Cm \&%X
 the time, using the locale's time format.
 .It Cm \&%y
 the year within the 20th century [69,99] or the 21st century [0,68];
 leading zeros are permitted but not required.
 If specified in conjunction
 with \&%C, specifies the year [0,99] within that century.
 .It Cm \&%Y
 the year, including the century (i.e., 1996).
 .It Cm \&%z
-an ISO 8601 timezone specification.
+an ISO 8601 or RFC-2822 timezone specification.
-This is either,
+This is one of the following:
 the offset from
 Coordinated Universal Time
 .Pq Ql UTC
 specified as:
 .Dq [+-]hhmm ,
 .Dq [+-]hh:mm ,
 or
 .Dq [+-]hh ;
 .Ql UTC
 specified as:
 .Dq GMT
 .Pq Ql Greenwich Mean Time ,
 .Dq UT
 .Pq Ql Universal Time ,
 or
 .Dq Z
-for
+.Pq Ql Zulu Time ;
-.Ql UTC ,
+a three character US timezone specified as:
-or the offset specified as:
+.Dq EDT ,
-.Dq [+-]hhmm
+.Dq EST ,
 .Dq CDT ,
 .Dq CST ,
 .Dq MDT ,
 .Dq MST ,
 .Dq PDT ,
 or
-.Dq [+-]hh:mm
+.Dq PST ,
 with the first letter standing for
 .Ql Eastern
 .Pq Dq E ,
 .Ql Central
 .Pq Dq C ,
 .Ql Mountain
 .Pq Dq M
 or
 .Ql Pacific
 .Pq Dq P ,
 and the second letter standing for
 .Ql Daylight
 .Po
 .Dq D
 or summer
 .Pc
 time
 or
-.Dq [+-]hh .
+.Ql Standard
 .Pq Dq S
 time;
 a single letter military timezone specified as:
 .Dq A
 through
 .Dq I
 and
 .Dq K
 through
 .Dq Y .
 .Po
+A
 .Nx
 extension.
 .Pc
 .It Cm \&%Z
 timezone name or no characters when time zone information is unavailable.
 .Po
+A
 .Nx
 extension.
 .Pc
 .It Cm \&%%

 @@ -1,14 +1,14 @@
-/*	$NetBSD: strptime.c,v 1.31 2008/11/04 21:08:33 christos Exp $	*/
+/*	$NetBSD: strptime.c,v 1.32 2009/05/01 20:15:05 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,27 +21,27 @@
  * 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.31 2008/11/04 21:08:33 christos Exp $");
+__RCSID("$NetBSD: strptime.c,v 1.32 2009/05/01 20:15:05 ginsbach Exp $");
 #endif
 #include "namespace.h"
 #include <sys/localedef.h>
 #include <ctype.h>
 #include <locale.h>
 #include <string.h>
 #include <time.h>
 #include <tzfile.h>
 #include "private.h"
 #ifdef __weak_alias
 __weak_alias(strptime,_strptime)
 @@ -49,38 +49,45 @@ __weak_alias(strptime,_strptime)
 #define	_ctloc(x)		(_CurrentTimeLocale->x)
 /*
  * 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; }
 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 *,
 	const char * const *, int);
 char *
 strptime(const char *buf, const char *fmt, struct tm *tm)
+{
 	unsigned char c;
-	const unsigned char *bp;
+	const unsigned char *bp, *ep;
-	int alt_format, i, split_year = 0, neg, offs;
+	int alt_format, i, split_year = 0, neg = 0, offs;
 	const char *new_fmt;
 	bp = (const u_char *)buf;
 	while (bp != NULL && (c = *fmt++) != '\0') {
 		/* Clear `alternate' modifier prior to new conversion. */
 		alt_format = 0;
 		i = 0;
 		/* Eat up white-space. */
 		if (isspace(c)) {
 			while (isspace(*bp))
 				bp++;
 @@ -310,72 +317,131 @@ literal:
 		case 'Z':
 			tzset();
 			if (strncmp((const char *)bp, gmt, 3) == 0) {
 				tm->tm_isdst = 0;
 #ifdef TM_GMTOFF
 				tm->TM_GMTOFF = 0;
 #endif
 #ifdef TM_ZONE
 				tm->TM_ZONE = gmt;
 #endif
 				bp += 3;
 			} else {
 				const unsigned char *ep;
 				ep = find_string(bp, &i,
 					       	 (const char * const *)tzname,
 					       	  NULL, 2);
 				if (ep != NULL) {
 					tm->tm_isdst = i;
 #ifdef TM_GMTOFF
 					tm->TM_GMTOFF = -(timezone);
 #endif
 #ifdef TM_ZONE
 					tm->TM_ZONE = tzname[i];
 #endif
+				}
 				bp = ep;
+			}
 			continue;
 		case 'z':
 			/*
 			 * We recognize all ISO 8601 formats:
 			 * Z	= Zulu time/UTC
 			 * [+-]hhmm
 			 * [+-]hh:mm
 			 * [+-]hh
 			 * We recognize all RFC-822/RFC-2822 formats:
 			 * UT|GMT
 			 *          North American : UTC offsets
 			 * E[DS]T = Eastern : -4 | -5
 			 * C[DS]T = Central : -5 | -6
 			 * M[DS]T = Mountain: -6 | -7
 			 * P[DS]T = Pacific : -7 | -8
 			 *          Military
 			 * [A-IL-M] = -1 ... -9 (J not used)
 			 * [N-Y]  = +1 ... +12
 			 */
 			while (isspace(*bp))
 				bp++;
 			switch (*bp++) {
 			case 'G':
 				if (*bp++ != 'M')
 					return NULL;
 				/*FALLTHROUGH*/
 			case 'U':
 				if (*bp++ != 'T')
 					return NULL;
 				/*FALLTHROUGH*/
 			case 'Z':
 				tm->tm_isdst = 0;
 #ifdef TM_GMTOFF
 				tm->TM_GMTOFF = 0;
 #endif
 #ifdef TM_ZONE
 				tm->TM_ZONE = utc;
 #endif
 				continue;
 			case '+':
 				neg = 0;
 				break;
 			case '-':
 				neg = 1;
 				break;
 			default:
 				--bp;
 				ep = find_string(bp, &i, nast, NULL, 4);
 				if (ep != NULL) {
 #ifdef TM_GMTOFF
 					tm->TM_GMTOFF = -5 - i;
 #endif
 #ifdef TM_ZONE
 					tm->TM_ZONE = __UNCONST(nast[i]);
 #endif
 					bp = ep;
 					continue;
+				}
 				ep = find_string(bp, &i, nadt, NULL, 4);
 				if (ep != NULL) {
 					tm->tm_isdst = 1;
 #ifdef TM_GMTOFF
 					tm->TM_GMTOFF = -4 - i;
 #endif
 #ifdef TM_ZONE
 					tm->TM_ZONE = __UNCONST(nadt[i]);
 #endif
 					bp = ep;
 					continue;
+				}
 				if ((*bp >= 'A' && *bp <= 'I') ||
 				    (*bp >= 'L' && *bp <= 'Y')) {
 #ifdef TM_GMTOFF
 					/* Argh! No 'J'! */
 					if (*bp >= 'A' && *bp <= 'I')
 						tm->TM_GMTOFF =
 						    ('A' - 1) - (int)*bp;
 					else if (*bp >= 'L' && *bp <= 'M')
 						tm->TM_GMTOFF = 'A' - (int)*bp;
 					else if (*bp >= 'N' && *bp <= 'Y')
 						tm->TM_GMTOFF = (int)*bp - 'M';
 #endif
 #ifdef TM_ZONE
 					tm->TM_ZONE = NULL; /* XXX */
 #endif
 					bp++;
 					continue;
+				}
 				return NULL;
+			}
 			offs = 0;
 			for (i = 0; i < 4; ) {
 				if (isdigit(*bp)) {
 					offs = offs * 10 + (*bp++ - '0');
 					i++;
 					continue;
+				}
 				if (i == 2 && *bp == ':') {
 					bp++;
 					continue;
+				}