From patchwork Tue Jan 27 15:20:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Bernat X-Patchwork-Id: 4827 X-Patchwork-Delegate: vapier@gentoo.org Received: (qmail 32730 invoked by alias); 27 Jan 2015 15:20:17 -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 32644 invoked by uid 89); 27 Jan 2015 15:20:12 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-0.0 required=5.0 tests=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 Cc: Vincent Bernat Subject: [PATCH] time: in strptime(), make %z accept [+-]HH:MM time zones Date: Tue, 27 Jan 2015 16:20:04 +0100 Message-Id: <1422372004-32522-1-git-send-email-Vincent.Bernat@exoscale.ch> From: Vincent Bernat In ISO 8601, +03:30 is a valid time zone. Currently, strptime() only parses it as a 2-digit time zone an believes this is +03:00. This change makes it accept a single semi-colon. This fix BZ #17887. --- ChangeLog | 3 +++ time/strptime_l.c | 18 ++++++++++++++---- time/tst-strptime2.c | 9 +++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24c1a74c963d..0f3e4bdc72a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ [BZ #17886] * time/strptime_l.c: Make %z accept Z as a valid time zone. + [BZ #17887] + * time/strptime_l.c: Make %z accept [+-]HH:MM time zones. + 2015-01-27 Andreas Krebbel * iconv/loop.c: Suppress array out of bound warning caused by GCC diff --git a/time/strptime_l.c b/time/strptime_l.c index 78882ec39aed..3326e110d928 100644 --- a/time/strptime_l.c +++ b/time/strptime_l.c @@ -749,9 +749,11 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM) rp++; break; case 'z': - /* We recognize three formats: if two digits are given, these - specify hours. If fours digits are used, minutes are - also specified. 'Z' is equivalent to +0000. */ + /* We recognize four formats: 1. if two digits are given, + these specify hours. 2. If fours digits are used, + minutes are also specified. 3. A semi-colon can be used + to separate the two groups of two digits (HH:MM). 4. 'Z' + is equivalent to +0000. */ { val = 0; while (ISSPACE (*rp)) @@ -765,8 +767,16 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM) return NULL; bool neg = *rp++ == '-'; int n = 0; - while (n < 4 && *rp >= '0' && *rp <= '9') + while (n < 4 && + ((*rp >= '0' && *rp <= '9') || + (*rp == ':' && n == 2))) { + if (*rp == ':') + { + rp++; + if (!(*rp >= '0' && *rp <= '9')) + return NULL; + } val = val * 10 + *rp++ - '0'; ++n; } diff --git a/time/tst-strptime2.c b/time/tst-strptime2.c index c22967a93026..1c0958fc8bc0 100644 --- a/time/tst-strptime2.c +++ b/time/tst-strptime2.c @@ -13,16 +13,25 @@ static const struct { "1113472456 -1000", -36000 }, { "1113472456 +10", 36000 }, { "1113472456 -10", -36000 }, + { "1113472456 +10:00", 36000 }, + { "1113472456 -10:00", -36000 }, { "1113472456 +1030", 37800 }, { "1113472456 -1030", -37800 }, + { "1113472456 +10:30", 37800 }, + { "1113472456 -10:30", -37800 }, { "1113472456 +0030", 1800 }, { "1113472456 -0030", -1800 }, { "1113472456 Z", 0 }, { "1113472456 -1330", LONG_MAX }, { "1113472456 +1330", LONG_MAX }, + { "1113472456 -13:30", LONG_MAX }, + { "1113472456 +13:30", LONG_MAX }, { "1113472456 -1060", LONG_MAX }, { "1113472456 +1060", LONG_MAX }, + { "1113472456 -10:60", LONG_MAX }, + { "1113472456 +10:60", LONG_MAX }, { "1113472456 1030", LONG_MAX }, + { "1113472456 10:30", LONG_MAX }, }; #define ntests (sizeof (tests) / sizeof (tests[0]))