* locale/programs/ld-ctype.c: Handle SP and space consistently.
This commit is contained in:
Ulrich Drepper 2000-06-07 19:13:50 +00:00
parent 2a63199095
commit 45c952394b
2 changed files with 12 additions and 0 deletions

View File

@ -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.

View File

@ -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)
@ -2697,6 +2701,8 @@ set_class_defaults (struct locale_ctype_t *ctype, struct charmap_t *charmap,
struct charseq *seq;
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)
@ -2839,6 +2845,8 @@ character `%s' not defined while needed as default value"),
struct charseq *seq;
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)
@ -2919,6 +2927,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)