From patchwork Wed Sep 16 08:47:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Bernat X-Patchwork-Id: 8720 X-Patchwork-Delegate: vapier@gentoo.org Received: (qmail 59534 invoked by alias); 16 Sep 2015 08:47:42 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 59507 invoked by uid 89); 16 Sep 2015 08:47:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=AWL, BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: bart.luffy.cx From: Vincent Bernat To: libc-alpha@sourceware.org, James Perkins , Mike Frysinger Cc: Vincent Bernat Subject: [PATCH 1/2] time: in strptime(), make %z accept Z as a time zone [BZ #17886] Date: Wed, 16 Sep 2015 10:47:22 +0200 Message-Id: <1442393243-30956-1-git-send-email-Vincent.Bernat@exoscale.ch> In-Reply-To: <20150911174300.GB2802@gmail.com> References: <20150911174300.GB2802@gmail.com> From: Vincent Bernat In ISO 8601, the timezone can be 'Z' instead of using digits. 2014-08-17T12:33:12+0000 is often expressed as 2014-08-17T12:33:12Z. This fixes BZ #17886. 2015-09-16 Vincent Bernat [BZ #17886] * time/strptime_l.c (__strptime_internal): Make %z accept Z as a valid time zone. --- time/strptime_l.c | 10 ++++++++-- time/tst-strptime2.c | 7 +++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/time/strptime_l.c b/time/strptime_l.c index 4203ad81a0f3..989edd6144e6 100644 --- a/time/strptime_l.c +++ b/time/strptime_l.c @@ -749,13 +749,19 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM) rp++; break; case 'z': - /* We recognize two formats: if two digits are given, these + /* We recognize three formats: if two digits are given, these specify hours. If fours digits are used, minutes are - also specified. */ + also specified. 'Z' is equivalent to +0000. */ { val = 0; while (ISSPACE (*rp)) ++rp; + if (*rp == 'Z') + { + ++rp; + tm->tm_gmtoff = 0; + break; + } if (*rp != '+' && *rp != '-') return NULL; bool neg = *rp++ == '-'; diff --git a/time/tst-strptime2.c b/time/tst-strptime2.c index 5b06a63ba4c3..cfb7d70c4cc2 100644 --- a/time/tst-strptime2.c +++ b/time/tst-strptime2.c @@ -155,6 +155,13 @@ do_test (void) expect = LONG_MAX; result |= compare (buf, expect, nresult); + /* Create and test input string with "Z" input (valid format). + Expect tm_gmtoff of 0. */ + + sprintf (buf, "%s Z", dummy_string); + expect = 0; + result |= compare (buf, expect, nresult); + /* Create and test input strings with sign and digits: 0 digits (invalid format), 1 digit (invalid format),