diff options
Diffstat (limited to 'locale/programs/ld-collate.c')
| -rw-r--r-- | locale/programs/ld-collate.c | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index f4a8f34..06a5203 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -23,6 +23,7 @@ #include <wchar.h> #include <stdint.h> #include <sys/param.h> +#include <array_length.h> #include "localedef.h" #include "charmap.h" @@ -194,6 +195,9 @@ struct name_list /* The real definition of the struct for the LC_COLLATE locale. */ struct locale_collate_t { + /* Does the locale use code points to compare the encoding? */ + bool codepoint_collation; + int col_weight_max; int cur_weight_max; @@ -1509,6 +1513,7 @@ collate_startup (struct linereader *ldfile, struct localedef_t *locale, obstack_init (&collate->mempool); collate->col_weight_max = -1; + collate->codepoint_collation = false; } else /* Reuse the copy_locale's data structures. */ @@ -1567,6 +1572,10 @@ collate_finish (struct localedef_t *locale, const struct charmap_t *charmap) return; } + /* No data required. */ + if (collate->codepoint_collation) + return; + /* If this assertion is hit change the type in `element_t'. */ assert (nrules <= sizeof (runp->used_in_level) * 8); @@ -2091,6 +2100,10 @@ add_to_tablewc (uint32_t ch, struct element_t *runp) } } +/* Include the C locale identity tables for _NL_COLLATE_COLLSEQMB and + _NL_COLLATE_COLLSEQWC. */ +#include "C-collate-seq.c" + void collate_output (struct localedef_t *locale, const struct charmap_t *charmap, const char *output_path) @@ -2114,7 +2127,7 @@ collate_output (struct localedef_t *locale, const struct charmap_t *charmap, add_locale_uint32 (&file, nrules); /* If we have no LC_COLLATE data emit only the number of rules as zero. */ - if (collate == NULL) + if (collate == NULL || collate->codepoint_collation) { size_t idx; for (idx = 1; idx < nelems; idx++) @@ -2122,6 +2135,17 @@ collate_output (struct localedef_t *locale, const struct charmap_t *charmap, /* The words have to be handled specially. */ if (idx == _NL_ITEM_INDEX (_NL_COLLATE_SYMB_HASH_SIZEMB)) add_locale_uint32 (&file, 0); + else if (idx == _NL_ITEM_INDEX (_NL_COLLATE_CODESET) + && collate != NULL) + /* A valid LC_COLLATE must have a code set name. */ + add_locale_string (&file, charmap->code_set_name); + else if (idx == _NL_ITEM_INDEX (_NL_COLLATE_COLLSEQMB) + && collate != NULL) + add_locale_raw_data (&file, collseqmb, sizeof (collseqmb)); + else if (idx == _NL_ITEM_INDEX (_NL_COLLATE_COLLSEQWC) + && collate != NULL) + add_locale_uint32_array (&file, collseqwc, + array_length (collseqwc)); else add_locale_empty (&file); } @@ -2671,6 +2695,10 @@ collate_read (struct linereader *ldfile, struct localedef_t *result, switch (nowtok) { + case tok_codepoint_collation: + collate->codepoint_collation = true; + break; + case tok_copy: /* Allow copying other locales. */ now = lr_token (ldfile, charmap, result, NULL, verbose); @@ -3741,9 +3769,11 @@ error while adding equivalent collating symbol")); /* Next we assume `LC_COLLATE'. */ if (!ignore_content) { - if (state == 0 && copy_locale == NULL) + if (state == 0 + && copy_locale == NULL + && !collate->codepoint_collation) /* We must either see a copy statement or have - ordering values. */ + ordering values, or codepoint_collation. */ lr_error (ldfile, _("%s: empty category description not allowed"), "LC_COLLATE"); |