about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-04-15 14:52:19 -0400
committerMike Frysinger <vapier@gentoo.org>2016-04-16 03:35:25 -0400
commita837257199ffab76237385b830cc7b6179fc2f18 (patch)
tree4451e3c99a082323859e0889310deeeaef901f14
parent7c84d5ce26f452fc08f6d9f7d6c13cf8831c5d49 (diff)
downloadglibc-a837257199ffab76237385b830cc7b6179fc2f18.tar.gz
glibc-a837257199ffab76237385b830cc7b6179fc2f18.tar.xz
glibc-a837257199ffab76237385b830cc7b6179fc2f18.zip
localedef: allow %l/%n in postal_fmt [BZ #16983]
ISO 14652/30112 includes %l & %n now, so permit them in our files.
-rw-r--r--ChangeLog6
-rw-r--r--locale/programs/ld-address.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a4cffe7d85..194be7bf89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-04-16  Mike Frysinger  <vapier@gentoo.org>
 
+	[BZ #16983]
+	* locale/programs/ld-address.c (address_finish): Update postal_fmt
+	comment.  Add "ln" to strchr check on postal_fmt.
+
+2016-04-16  Mike Frysinger  <vapier@gentoo.org>
+
 	* locale/programs/ld-telephone.c (telephone_finish): Add %t to the
 	default tel_int_fmt.  Add "Cet" to strchr check on tel_int_fmt and
 	tel_dom_fmt.
diff --git a/locale/programs/ld-address.c b/locale/programs/ld-address.c
index f13331941e..bfbdd623bc 100644
--- a/locale/programs/ld-address.c
+++ b/locale/programs/ld-address.c
@@ -150,8 +150,8 @@ No definition for %s category found"), "LC_ADDRESS"));
     }
   else
     {
-      /* We must check whether the format string contains only the
-	 allowed escape sequences.  */
+      /* We must check whether the format string contains only the allowed
+	 escape sequences.  Last checked against ISO 30112 WD10 [2014]. */
       const char *cp = address->postal_fmt;
 
       if (*cp == '\0')
@@ -165,7 +165,7 @@ No definition for %s category found"), "LC_ADDRESS"));
 		if (*++cp == 'R')
 		  /* Romanize-flag.  */
 		  ++cp;
-		if (strchr ("afdbshNtreCzTSc%", *cp) == NULL)
+		if (strchr ("nafdbshNtreClzTSc%", *cp) == NULL)
 		  {
 		    WITH_CUR_LOCALE (error (0, 0, _("\
 %s: invalid escape `%%%c' sequence in field `%s'"),