This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.23-207-ga837257


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  a837257199ffab76237385b830cc7b6179fc2f18 (commit)
      from  7c84d5ce26f452fc08f6d9f7d6c13cf8831c5d49 (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=a837257199ffab76237385b830cc7b6179fc2f18

commit a837257199ffab76237385b830cc7b6179fc2f18
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Fri Apr 15 14:52:19 2016 -0400

    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 a4cffe7..194be7b 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 f133319..bfbdd62 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'"),

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                    |    6 ++++++
 locale/programs/ld-address.c |    6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]