diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-12-27 05:05:12 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-12-27 05:05:12 +0000 |
| commit | 70e51ab9f37ec84b23ff5e090e0d9a322baf523d (patch) | |
| tree | 1891740b82b92c022c072834b979196199ae0b93 /locale/programs/ld-collate.c | |
| parent | c392db7c4be39bf2ad8668f6e75a1ec219da6b0e (diff) | |
| download | glibc-70e51ab9f37ec84b23ff5e090e0d9a322baf523d.tar glibc-70e51ab9f37ec84b23ff5e090e0d9a322baf523d.tar.gz glibc-70e51ab9f37ec84b23ff5e090e0d9a322baf523d.tar.bz2 glibc-70e51ab9f37ec84b23ff5e090e0d9a322baf523d.zip | |
Update.
* locale/programs/ld-collate.c (collate_output): Don't start with empty
extrapool and indirectpool obstacks since we need the offsets to be
nonzero.
(collate_read): Call load_locale, not find_locale.
* locale/programs/ld-ctype.c (ctype_finish): If LC_CTYPE category
wasn't defined in the file also initialize repertoire if possible.
* locale/programs/ld-time.c (time_finish): Fix message string.
* locale/programs/linereader.c: Cast parameters of lr_error to
correct type to prevnet warning.
* locale/programs/localedef.c (load_locale): New file.
* locale/programs/localedef.h: Add its prototype.
* locale/programs/repertoire.c (repertoire_new_char): Add missing
parameters to lr_error call.
* localedata/Makefile: Enable running tests again.
* localedata/tests/test2.def: Adjust syntax to new specification.
* localedata/tests/test3.def: Likewise.
* localedata/tst-trans.sh: Redirect output of program into file.
* string/strcoll.c: Fix many error in new implementation to make it
pass (at least) the test suite.
* locale/Makefile: Don't link localedef statically anymore.
* locale/ld-collate.c (struct element_t): Add field is_character and
use it to distinguish real character from collating elements and
symbols.
* locale/programs/ld-time.c: Likewise.
Diffstat (limited to 'locale/programs/ld-collate.c')
| -rw-r--r-- | locale/programs/ld-collate.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index a716494796..a7eb8083a4 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -1677,6 +1677,21 @@ collate_output (struct localedef_t *locale, struct charmap_t *charmap, obstack_init (&extrapool); obstack_init (&indirectpool); + /* Since we are using the sign of an integer to mark indirection the + offsets in the arrays we are indirectly referring to must not be + zero since -0 == 0. Therefore we add a bit of dummy content. */ + if (sizeof (int) == sizeof (int32_t)) + { + obstack_int_grow (&extrapool, 0); + obstack_int_grow (&indirectpool, 0); + } + else + { + int32_t zero = 0; + obstack_grow (&extrapool, &zero, sizeof (zero)); + obstack_grow (&indirectpool, &zero, sizeof (zero)); + } + /* Prepare the ruleset table. */ for (sect = collate->sections, i = 0; sect != NULL; sect = sect->next) if (sect->ruleidx == i) @@ -1978,7 +1993,7 @@ collate_read (struct linereader *ldfile, struct localedef_t *result, } /* Get the locale definition. */ - copy_locale = find_locale (LC_COLLATE, now->val.str.startmb, + copy_locale = load_locale (LC_COLLATE, now->val.str.startmb, repertoire_name, charmap); if ((copy_locale->avail & COLLATE_LOCALE) == 0) { |