about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-04-01 00:51:57 +0000
committerUlrich Drepper <drepper@redhat.com>2004-04-01 00:51:57 +0000
commitc3d0870737e92eca92e261e97367bca00fdee7a4 (patch)
tree6d00305215f1d6da1ebb52c21beffd8ac7ba22aa
parent5bbbc42a2aad47d0086181f9a875422de6ed2c79 (diff)
downloadglibc-c3d0870737e92eca92e261e97367bca00fdee7a4.tar.gz
glibc-c3d0870737e92eca92e261e97367bca00fdee7a4.tar.xz
glibc-c3d0870737e92eca92e261e97367bca00fdee7a4.zip
Update.
2004-03-31  Ulrich Drepper  <drepper@redhat.com>

	* locale/programs/localedef.c (construct_output_path): Remove
	remnants of CEN locale names.
-rw-r--r--ChangeLog5
-rw-r--r--locale/programs/localedef.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ab5c27408b..5fcf8cccdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-31  Ulrich Drepper  <drepper@redhat.com>
+
+	* locale/programs/localedef.c (construct_output_path): Remove
+	remnants of CEN locale names.
+
 2004-03-30  Thorsten Kukuk  <kukuk@suse.de>
 
 	* sysdeps/unix/sysv/linux/alpha/bits/termios.h: Add IUTF8.
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index f2c3c3b89c..b38ce6c53e 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -421,8 +421,7 @@ construct_output_path (char *path)
       startp = path;
       /* We must be prepared for finding a CEN name or a location of
 	 the introducing `.' where it is not possible anymore.  */
-      while (*startp != '\0' && *startp != '@' && *startp != '.'
-	     && *startp != '+' && *startp != ',')
+      while (*startp != '\0' && *startp != '@' && *startp != '.')
 	++startp;
       if (*startp == '.')
 	{