diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-07-05 22:02:03 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-07-05 22:02:03 +0000 |
| commit | f3e29a1a0f56035dcc343afea952dd8c0d4f42d0 (patch) | |
| tree | 0f948e1c54148cc52a72e6efb2c9937cc1ff2a70 /locale/programs/ld-collate.c | |
| parent | 6e5f82858cd604c00fb598ab7fc804a87e172e0e (diff) | |
| download | glibc-f3e29a1a0f56035dcc343afea952dd8c0d4f42d0.tar.gz glibc-f3e29a1a0f56035dcc343afea952dd8c0d4f42d0.tar.xz glibc-f3e29a1a0f56035dcc343afea952dd8c0d4f42d0.zip | |
Update.
2000-07-05 Ulrich Drepper <drepper@redhat.com> * locale/loadlocale.c (_nl_unload_locale): Add cast to avoid warning. * locale/programs/ld-collate.c (collate_output): Also write out the collation sequence values and the wide character string for the collation symbol table. * posix/fnmatch.c: Include "../locale/elem-hash.h". * posix/fnmatch_loop.c: Implement collating symbol handling. * posix/tst-fnmatch.input: Add more tests, especially for collating symbol handling. * posix/regex.c: Fix comment.
Diffstat (limited to 'locale/programs/ld-collate.c')
| -rw-r--r-- | locale/programs/ld-collate.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index 97059c2593..89621c82e1 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -2611,6 +2611,17 @@ collate_output (struct localedef_t *locale, struct charmap_t *charmap, (sizeof (int32_t) - ((1 + namelen + 1 + runp->nmbs) % sizeof (int32_t)))); + + /* Now some 32-bit values: multibyte collation sequence, + wide char string (including length), and wide char + collation sequence. */ + obstack_int_grow (&extrapool, runp->mbseqorder); + + obstack_int_grow (&extrapool, runp->nwcs); + obstack_grow (&extrapool, runp->wcs, + runp->nwcs * sizeof (uint32_t)); + + obstack_int_grow (&extrapool, runp->wcseqorder); } } |