From: Vincent Bernat <Vincent.Bernat@exoscale.ch>
To: libc-alpha@sourceware.org
Cc: Vincent Bernat <vincent@bernat.im>
Subject: [PATCH] time: in strptime(), make %z accept [+-]HH:MM time zones
Date: Tue, 27 Jan 2015 16:03:00 -0000 [thread overview]
Message-ID: <1422372004-32522-1-git-send-email-Vincent.Bernat@exoscale.ch> (raw)
From: Vincent Bernat <vincent@bernat.im>
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 <Andreas.Krebbel@de.ibm.com>
* 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]))
--
2.1.4
next prev reply other threads:[~2015-01-27 15:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-27 15:20 [PATCH] time: ensure failing strptime() tests are reported correctly Vincent Bernat
2015-01-27 16:02 ` [PATCH] time: in strptime(), make %z accept Z as a time zone Vincent Bernat
2015-03-06 10:11 ` Mike Frysinger
2015-01-27 16:03 ` Vincent Bernat [this message]
2015-03-06 10:21 ` [PATCH] time: in strptime(), make %z accept [+-]HH:MM time zones Mike Frysinger
2015-03-06 11:06 ` Vincent Bernat
2015-04-20 11:42 ` [BZ #17887][PATCH] " Vincent Bernat
2015-03-06 10:04 ` [PATCH] time: ensure failing strptime() tests are reported correctly Mike Frysinger
2015-03-06 11:02 ` Vincent Bernat
2015-03-06 11:07 ` Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1422372004-32522-1-git-send-email-Vincent.Bernat@exoscale.ch \
--to=vincent.bernat@exoscale.ch \
--cc=libc-alpha@sourceware.org \
--cc=vincent@bernat.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).