OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

2002-01-18  Isamu Hasegawa  <isamu@yamato.ibm.com>

	* locale/program/ld-collate.c (collate_finish): Assign a wide
	char collation sequence value to multi character collating
	elements, and avoid over writing by non-character elements.
This commit is contained in:
Ulrich Drepper 2002-02-01 21:08:09 +00:00
parent 635f35fcf4
commit 9c1084a380
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2002-01-18 Isamu Hasegawa <isamu@yamato.ibm.com>
* locale/program/ld-collate.c (collate_finish): Assign a wide
char collation sequence value to multi character collating
elements, and avoid over writing by non-character elements.
2002-02-01 Ulrich Drepper <drepper@redhat.com> 2002-02-01 Ulrich Drepper <drepper@redhat.com>
* elf/Makefile (distribute): Add dl-procinfo.c. * elf/Makefile (distribute): Add dl-procinfo.c.

10
locale/programs/ld-collate.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. /* Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
@ -1672,6 +1672,9 @@ collate_finish (struct localedef_t *locale, const struct charmap_t *charmap)
runp->wcseqorder = wcseqact++; runp->wcseqorder = wcseqact++;
} }
else if (runp->mbs != NULL && runp->weights != NULL)
/* This is for collation elements. */
runp->wcseqorder = wcseqact++;
/* Up to the next entry. */ /* Up to the next entry. */
runp = runp->next; runp = runp->next;
@ -1706,8 +1709,9 @@ collate_finish (struct localedef_t *locale, const struct charmap_t *charmap)
struct element_t *lastp; struct element_t *lastp;
/* Insert the collation sequence value. */ /* Insert the collation sequence value. */
collseq_table_add (&collate->wcseqorder, runp->wcs[0], if (runp->is_character)
runp->wcseqorder); collseq_table_add (&collate->wcseqorder, runp->wcs[0],
runp->wcseqorder);
/* Find the point where to insert in the list. */ /* Find the point where to insert in the list. */
e = wchead_table_get (&collate->wcheads, runp->wcs[0]); e = wchead_table_get (&collate->wcheads, runp->wcs[0]);

4
localedata/ChangeLog
View File

@ -1,3 +1,7 @@
2002-02-01 Ulrich Drepper <drepper@redhat.com>
* da_DK.in: Add a few more character sequences, no real words.
2002-01-17 Ulrich Drepper <drepper@redhat.com> 2002-01-17 Ulrich Drepper <drepper@redhat.com>
* charmaps/MACINTOSH: Update to Apple's latest definition. * charmaps/MACINTOSH: Update to Apple's latest definition.

7
localedata/da_DK.in
View File

@ -1,3 +1,4 @@
A
A/S A/S
ANDRE ANDRE
ANDRÉ ANDRÉ
@ -29,6 +30,7 @@ R
REE, B REE, B
RÉE, L RÉE, L
REE, V REE, V
SA
SCHYTT, B SCHYTT, B
SCHYTT, H SCHYTT, H
SCHÜTT, H SCHÜTT, H
@ -41,6 +43,9 @@ STORE VILDMOSE
STOREKÆR STOREKÆR
STORM PETERSEN STORM PETERSEN
STORMLY STORMLY
SĹ
SAA
Saa
THORVALD THORVALD
THORVARDUR THORVARDUR
ÞORVARÐUR ÞORVARÐUR
@ -52,3 +57,5 @@ VESTERG
ÄBLE ÄBLE
ØBERG ØBERG
ÖBERG ÖBERG
AA
aa