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-ctype.c | |
| parent | c392db7c4be39bf2ad8668f6e75a1ec219da6b0e (diff) | |
| download | glibc-70e51ab9f37ec84b23ff5e090e0d9a322baf523d.tar.gz glibc-70e51ab9f37ec84b23ff5e090e0d9a322baf523d.tar.xz 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-ctype.c')
| -rw-r--r-- | locale/programs/ld-ctype.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index 97ff7fc8bb..0fd430662f 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -324,6 +324,8 @@ ctype_finish (struct localedef_t *locale, struct charmap_t *charmap) /* Now resolve copying and also handle completely missing definitions. */ if (ctype == NULL) { + const char *repertoire_name; + /* First see whether we were supposed to copy. If yes, find the actual definition. */ if (locale->copy_name[LC_CTYPE] != NULL) @@ -351,6 +353,11 @@ ctype_finish (struct localedef_t *locale, struct charmap_t *charmap) ctype_startup (NULL, locale, charmap, 0); ctype = locale->categories[LC_CTYPE].ctype; } + + /* Get the repertoire we have to use. */ + repertoire_name = locale->repertoire_name ?: repertoire_global; + if (repertoire_name != NULL) + ctype->repertoire = repertoire_read (repertoire_name); } /* Set default value for classes not specified. */ |