From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 15 Apr 2016 18:52:19 +0000 (-0400)
Subject: localedef: allow %l/%n in postal_fmt [BZ #16983]
X-Git-Tag: glibc-2.24~371
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=a837257199ffab76237385b830cc7b6179fc2f18;p=glibc.git

localedef: allow %l/%n in postal_fmt [BZ #16983]

ISO 14652/30112 includes %l & %n now, so permit them in our files.
---

diff --git a/ChangeLog b/ChangeLog
index a4cffe7d85..194be7bf89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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
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'"),