diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | locale/programs/ld-ctype.c | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 555199c8a3..fdf06f0cd2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2000-06-07 Ulrich Drepper <drepper@redhat.com> + * locale/programs/ld-ctype.c: Handle SP and space consistently. + * locale/programs/charmap.c: Allow string arguments for code_set_name and repertoiremap. diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index 8bef3ee7ca..be735e3796 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -533,6 +533,10 @@ character '%s' in class `%s' must not be in class `%s'"), ELEM (ctype, class_collection, , space_value) |= BITw (tok_print); space_seq = charmap_find_value (charmap, "SP", 2); + if (space_req == NULL) + space_seq = charmap_find_value (charmap, "space", 5); + if (space_seq == NULL) + space_seq = charmap_find_value (charmap, "U00000020", 5); if (space_seq == NULL || space_seq->nbytes != 1) { if (!be_quiet) @@ -2698,6 +2702,8 @@ set_class_defaults (struct locale_ctype_t *ctype, struct charmap_t *charmap, seq = charmap_find_value (charmap, "space", 5); if (seq == NULL) + seq = charmap_find_value (charmap, "SP", 2); + if (seq == NULL) seq = charmap_find_value (charmap, "U00000020", 9); if (seq == NULL) { @@ -2840,6 +2846,8 @@ character `%s' not defined while needed as default value"), seq = charmap_find_value (charmap, "space", 5); if (seq == NULL) + seq = charmap_find_value (charmap, "SP", 2); + if (seq == NULL) seq = charmap_find_value (charmap, "U00000020", 9); if (seq == NULL) { @@ -2920,6 +2928,8 @@ character `%s' not defined while needed as default value"), seq = charmap_find_value (charmap, "space", 5); if (seq == NULL) + seq = charmap_find_value (charmap, "SP", 2); + if (seq == NULL) seq = charmap_find_value (charmap, "U00000020", 9); if (seq == NULL) { |