From owner-svn-src-all@FreeBSD.ORG  Sun Oct  5 07:29:51 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A5DE450F;
 Sun,  5 Oct 2014 07:29:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9247CE6B;
 Sun,  5 Oct 2014 07:29:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s957Tpe6020061;
 Sun, 5 Oct 2014 07:29:51 GMT (envelope-from ache@FreeBSD.org)
Received: (from ache@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s957TpY9020060;
 Sun, 5 Oct 2014 07:29:51 GMT (envelope-from ache@FreeBSD.org)
Message-Id: <201410050729.s957TpY9020060@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ache set sender to ache@FreeBSD.org
 using -f
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Sun, 5 Oct 2014 07:29:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r272562 - head/lib/libc/stdtime
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Oct 2014 07:29:51 -0000

Author: ache
Date: Sun Oct  5 07:29:50 2014
New Revision: 272562
URL: https://svnweb.freebsd.org/changeset/base/272562

Log:
  1) For %Z format, understand "UTC" name too.
  2) Return NULL if timegm() fails, because it means we can convert
  what we have in GMT to local time needed.

Modified:
  head/lib/libc/stdtime/strptime.c

Modified: head/lib/libc/stdtime/strptime.c
==============================================================================
--- head/lib/libc/stdtime/strptime.c	Sun Oct  5 07:27:05 2014	(r272561)
+++ head/lib/libc/stdtime/strptime.c	Sun Oct  5 07:29:50 2014	(r272562)
@@ -552,7 +552,8 @@ label:
 				strncpy(zonestr, buf, cp - buf);
 				zonestr[cp - buf] = '\0';
 				tzset();
-				if (0 == strcmp(zonestr, "GMT")) {
+				if (0 == strcmp(zonestr, "GMT") ||
+				    0 == strcmp(zonestr, "UTC")) {
 				    *GMTp = 1;
 				} else if (0 == strcmp(zonestr, tzname[0])) {
 				    tm->tm_isdst = 0;
@@ -674,6 +675,9 @@ strptime_l(const char * __restrict buf, 
 	ret = _strptime(buf, fmt, tm, &gmt, loc);
 	if (ret && gmt) {
 		time_t t = timegm(tm);
+
+		if (t == -1)
+			return (NULL);
 		localtime_r(&t, tm);
 	}