This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.18-328-gddc7e41
- From: neleai at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 25 Oct 2013 17:07:12 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.18-328-gddc7e41
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via ddc7e412ab252e7360a4357664beb3b5d9c4f42b (commit)
from ca42d35ea1a4b69b11a3b9a3e3bd1390470d188f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ddc7e412ab252e7360a4357664beb3b5d9c4f42b
commit ddc7e412ab252e7360a4357664beb3b5d9c4f42b
Author: OndÅ?ej BÃlka <neleai@seznam.cz>
Date: Fri Oct 25 19:04:47 2013 +0200
Make strptime %Z consistent between doc and code. Fixes bug 14876
diff --git a/NEWS b/NEWS
index 00d64f4..5055324 100644
--- a/NEWS
+++ b/NEWS
@@ -10,13 +10,13 @@ Version 2.19
* The following bugs are resolved with this release:
156, 431, 832, 10278, 13028, 13982, 13985, 14029, 14155, 14547, 14699,
- 14910, 15048, 15218, 15277, 15308, 15362, 15400, 15427, 15522, 15531,
- 15532, 15608, 15609, 15610, 15632, 15640, 15670, 15672, 15680, 15681,
- 15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760, 15764, 15797,
- 15825, 15844, 15847, 15849, 15855, 15856, 15857, 15859, 15867, 15886,
- 15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921,
- 15923, 15939, 15948, 15963, 15966, 15988, 16032, 16034, 16036, 16041,
- 16072, 16074.
+ 14876, 14910, 15048, 15218, 15277, 15308, 15362, 15400, 15427, 15522,
+ 15531, 15532, 15608, 15609, 15610, 15632, 15640, 15670, 15672, 15680,
+ 15681, 15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760, 15764,
+ 15797, 15825, 15844, 15847, 15849, 15855, 15856, 15857, 15859, 15867,
+ 15886, 15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919,
+ 15921, 15923, 15939, 15948, 15963, 15966, 15988, 16032, 16034, 16036,
+ 16041, 16072, 16074.
* CVE-2012-4412 The strcoll implementation caches indices and rules for
large collation sequences to optimize multiple passes. This cache
diff --git a/time/strptime_l.c b/time/strptime_l.c
index 00fc1ef..c2c2ee8 100644
--- a/time/strptime_l.c
+++ b/time/strptime_l.c
@@ -744,7 +744,11 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM)
s.want_xday = 1;
break;
case 'Z':
- /* XXX How to handle this? */
+ /* Read timezone but perform no conversion. */
+ while (ISSPACE (*rp))
+ rp++;
+ while (!ISSPACE (*rp) && *rp != '\0')
+ rp++;
break;
case 'z':
/* We recognize two formats: if two digits are given, these
diff --git a/time/tst-strptime.c b/time/tst-strptime.c
index 21fbb63..193f7db 100644
--- a/time/tst-strptime.c
+++ b/time/tst-strptime.c
@@ -41,6 +41,7 @@ static const struct
{ "C", "19990502123412", "%Y%m%d%H%M%S", 0, 121, 4, 2 },
{ "C", "2001 20 Mon", "%Y %U %a", 1, 140, 4, 21 },
{ "C", "2001 21 Mon", "%Y %W %a", 1, 140, 4, 21 },
+ { "C", "2001 EST 21 Mon", "%Y %Z %W %a", 1, 140, 4, 21 },
{ "C", "2012 00 Sun", "%Y %W %a", 0, 0, 0, 1 },
{ "ja_JP.EUC-JP", "2000-01-01 08:12:21 AM", "%Y-%m-%d %I:%M:%S %p",
6, 0, 0, 1 },
-----------------------------------------------------------------------
Summary of changes:
NEWS | 14 +++++++-------
time/strptime_l.c | 6 +++++-
time/tst-strptime.c | 1 +
3 files changed, 13 insertions(+), 8 deletions(-)
hooks/post-receive
--
GNU C Library master sources