qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

1999-12-30  Ulrich Drepper  <drepper@cygnus.com>

	* locale/programs/ld-collate.c (insert_value): Don't pass wide string
	to new_element if the wide char is not valid.
	(handle_ellipsis): Likewise.
	(collate_read): It's no problem if the string in the collating element
	definition cannot be represented as multibyte or wide char string.
This commit is contained in:
Ulrich Drepper 1999-12-30 16:53:41 +00:00
parent 66ac0abe03
commit a22cd12f5e
2 changed files with 28 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
1999-12-30 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-collate.c (insert_value): Don't pass wide string
to new_element if the wide char is not valid.
(handle_ellipsis): Likewise.
(collate_read): It's no problem if the string in the collating element
definition cannot be represented as multibyte or wide char string.
1999-12-13 Andreas Jaeger <aj@suse.de> 1999-12-13 Andreas Jaeger <aj@suse.de>
* resolv/resolv.h: Remove K&R compatibility. * resolv/resolv.h: Remove K&R compatibility.

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

@ -876,7 +876,8 @@ insert_value (struct linereader *ldfile, struct token *arg,
/* We have to allocate an entry. */ /* We have to allocate an entry. */
elem = new_element (collate, seq != NULL ? seq->bytes : NULL, elem = new_element (collate, seq != NULL ? seq->bytes : NULL,
seq != NULL ? seq->nbytes : 0, wcs, seq != NULL ? seq->nbytes : 0,
wc == ILLEGAL_CHAR_VALUE ? NULL : wcs,
arg->val.str.startmb, arg->val.str.lenmb, 1); arg->val.str.startmb, arg->val.str.lenmb, 1);
/* And add it to the table. */ /* And add it to the table. */
@ -1061,7 +1062,9 @@ sequence is not lower than that of the last character"), "LC_COLLATE");
uint32_t wcs[2] = { seq->ucs4, 0 }; uint32_t wcs[2] = { seq->ucs4, 0 };
/* We have to allocate an entry. */ /* We have to allocate an entry. */
elem = new_element (collate, mbcnt, len, wcs, seq->name, elem = new_element (collate, mbcnt, len,
seq->ucs4 == ILLEGAL_CHAR_VALUE
? NULL : wcs, seq->name,
namelen, 1); namelen, 1);
/* And add it to the table. */ /* And add it to the table. */
@ -1257,8 +1260,7 @@ order for `%.*s' already defined at %s:%zu"),
seq != NULL ? seq->bytes : NULL, seq != NULL ? seq->bytes : NULL,
seq != NULL ? seq->nbytes : 0, seq != NULL ? seq->nbytes : 0,
wc == ILLEGAL_CHAR_VALUE wc == ILLEGAL_CHAR_VALUE
? NULL : wcs, ? NULL : wcs, buf, lenfrom, 1);
buf, lenfrom, 1);
} }
else else
{ {
@ -2561,45 +2563,22 @@ collate_read (struct linereader *ldfile, struct localedef_t *result,
if (arg->tok != tok_string) if (arg->tok != tok_string)
goto err_label; goto err_label;
if (!ignore_content) if (!ignore_content && symbol != NULL)
{ {
if (symbol == NULL) /* The name is already defined. */
lr_error (ldfile, _("\ if (check_duplicate (ldfile, collate, charmap,
%s: unknown character in collating element name"), repertoire, symbol, symbol_len))
"LC_COLLATE");
if (arg->val.str.startmb == NULL)
lr_error (ldfile, _("\
%s: unknown character in collating element definition"),
"LC_COLLATE");
if (arg->val.str.startwc == NULL)
lr_error (ldfile, _("\
%s: unknown wide character in collating element definition"),
"LC_COLLATE");
else if (arg->val.str.lenwc < 2)
lr_error (ldfile, _("\
%s: substitution string in collating element definition must have at least two characters"),
"LC_COLLATE");
if (symbol != NULL)
{
/* The name is already defined. */
if (check_duplicate (ldfile, collate, charmap,
repertoire, symbol, symbol_len))
goto col_elem_free;
if (insert_entry (&collate->elem_table,
symbol, symbol_len,
new_element (collate,
arg->val.str.startmb,
arg->val.str.lenmb - 1,
arg->val.str.startwc,
symbol, symbol_len, 0))
< 0)
lr_error (ldfile, _("\
error while adding collating element"));
}
else
goto col_elem_free; goto col_elem_free;
if (insert_entry (&collate->elem_table,
symbol, symbol_len,
new_element (collate,
arg->val.str.startmb,
arg->val.str.lenmb - 1,
arg->val.str.startwc,
symbol, symbol_len, 0)) < 0)
lr_error (ldfile, _("\
error while adding collating element"));
} }
else else
{ {