about summary refs log tree commit diff
path: root/time/strptime_l.c
diff options
context:
space:
mode:
authorOndřej Bílka <neleai@seznam.cz>2013-10-25 19:04:47 +0200
committerOndřej Bílka <neleai@seznam.cz>2013-10-25 19:05:24 +0200
commitddc7e412ab252e7360a4357664beb3b5d9c4f42b (patch)
tree9e407ff2bbd78edb2bb1c59298d45636f123b3c2 /time/strptime_l.c
parentca42d35ea1a4b69b11a3b9a3e3bd1390470d188f (diff)
downloadglibc-ddc7e412ab252e7360a4357664beb3b5d9c4f42b.tar.gz
glibc-ddc7e412ab252e7360a4357664beb3b5d9c4f42b.tar.xz
glibc-ddc7e412ab252e7360a4357664beb3b5d9c4f42b.zip
Make strptime %Z consistent between doc and code. Fixes bug 14876
Diffstat (limited to 'time/strptime_l.c')
-rw-r--r--time/strptime_l.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/time/strptime_l.c b/time/strptime_l.c
index 00fc1ef594..c2c2ee83c5 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