diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 10 | ||||
| -rw-r--r-- | time/strptime_l.c | 10 | ||||
| -rw-r--r-- | time/tst-strptime2.c | 10 |
4 files changed, 28 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 5fe57ba2e0..97f05486cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-09-18 Vincent Bernat <vincent@bernat.im> + + [BZ #17886] + * time/strptime_l.c (__strptime_internal): Make %z accept Z as a + valid time zone. + 2015-09-17 Mike Frysinger <vapier@gentoo.org> * sysdeps/unix/sysv/linux/alpha/Makefile (CFLAGS-fdatasync.c): Delete. diff --git a/NEWS b/NEWS index e5a4629858..d304f8ce86 100644 --- a/NEWS +++ b/NEWS @@ -11,11 +11,11 @@ Version 2.23 2542, 2543, 2558, 2898, 4404, 6803, 14341, 14912, 15384, 15786, 15918, 16141, 16296, 16415, 16517, 16519, 16520, 16521, 16734, 16973, 16985, - 17118, 17243, 17244, 17787, 17905, 18084, 18086, 18240, 18265, 18370, - 18421, 18480, 18525, 18595, 18610, 18618, 18647, 18661, 18674, 18675, - 18681, 18757, 18778, 18781, 18787, 18789, 18790, 18795, 18796, 18820, - 18823, 18824, 18857, 18863, 18870, 18872, 18873, 18875, 18887, 18921, - 18951, 18952, 18961, 18966, 18967, 18970, 18977 + 17118, 17243, 17244, 17787, 17886, 17905, 18084, 18086, 18240, 18265, + 18370, 18421, 18480, 18525, 18595, 18610, 18618, 18647, 18661, 18674, + 18675, 18681, 18757, 18778, 18781, 18787, 18789, 18790, 18795, 18796, + 18820, 18823, 18824, 18857, 18863, 18870, 18872, 18873, 18875, 18887, + 18921, 18951, 18952, 18961, 18966, 18967, 18970, 18977. * The obsolete header <regexp.h> has been removed. Programs that require this header must be updated to use <regex.h> instead. diff --git a/time/strptime_l.c b/time/strptime_l.c index 4203ad81a0..989edd6144 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 5b06a63ba4..3d906dec74 100644 --- a/time/tst-strptime2.c +++ b/time/tst-strptime2.c @@ -31,7 +31,8 @@ static bool verbose; whitespace matching strptime " " format specifier, and timezone string matching strptime "%z" format specifier. - Note that a valid timezone string contains the following fields: + Note that a valid timezone string is either "Z" or contains the + following fields: Sign field consisting of a '+' or '-' sign, Hours field in two decimal digits, and optional Minutes field in two decimal digits. @@ -155,6 +156,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), |