Make strptime %Z consistent between doc and code. Fixes bug 14876

diff --git a/NEWS b/NEWS
index 00d64f4..5055324 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 },