qiurui/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2026-10-20 11:52:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2001-08-04  Ulrich Drepper  <drepper@redhat.com>

	* libio/genops.c (_IO_unbuffer_write): Force streams in narrow
	orientation so that conversion modules aren't used anymore.
	* malloc/set-freeres.c: Call _IO_cleanup before running subfreeres
	functions to avoid using wide streams afterwards.

	* iconvdata/Makefile: Add rules to build GEORGIAN-PS and
	GEORGIAN-ACADEMY.
	* iconvdata/georgian-ps.c: New file.
	* iconvdata/georgian-academy.c: New file.
	* iconvdata/gconv-modules: Add entries for GEORGIAN-PS and
	GEORGIAN-ACADEMY.
	* iconvdata/tst-tables.sh: Add GEORGIAN-PS and GEORGIAN-ACADEMY.
This commit is contained in:
Ulrich Drepper
2001-08-04 08:05:56 +00:00
parent 03003424c3
commit 6906cea4cc
14 changed files with 687 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
locale/programs/ld-collate.c
+29 -16
View File
@@ -939,24 +939,37 @@ insert_value (struct linereader *ldfile, const char *symstr, size_t symlen,
{
/* It's no character, so look through the collation elements and
symbol list. */
void *result;
if (find_entry (&collate->sym_table, symstr, symlen, &result) == 0)
{
/* It's a collation symbol. */
struct symbol_t *sym = (struct symbol_t *) result;
elem = sym->order;
if (elem == NULL)
elem = sym->order = new_element (collate, NULL, 0, NULL,
sym->name, strlen (sym->name), 0);
}
else if (find_entry (&collate->elem_table, symstr, symlen,
if (find_entry (&collate->elem_table, symstr, symlen,
(void **) &elem) != 0)
{
/* It's also no collation element. Therefore ignore it. */
lr_ignore_rest (ldfile, 0);
return 1;
void *result;
struct symbol_t *sym = NULL;
/* It's also collation element. Therefore it's either a
collating symbol or it's a character which is not
supported by the character set. In the later case we
simply create a dummy entry. */
if (find_entry (&collate->sym_table, symstr, symlen, &result) == 0)
{
/* It's a collation symbol. */
sym = (struct symbol_t *) result;
elem = sym->order;
}
if (elem == NULL)
{
elem = new_element (collate, NULL, 0, NULL, symstr, symlen, 0);
if (sym != NULL)
sym->order = elem;
else
/* Enter a fake element in the sequence table. This
won't cause anything in the output since there is
no multibyte or wide character associated with
it. */
insert_entry (&collate->seq_table, symstr, symlen, elem);
}
}
}
else