about summary refs log tree commit diff
path: root/locale
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-07 19:13:50 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-07 19:13:50 +0000
commit45c952394b49a40b456ed049b3dc305ec07de576 (patch)
tree45ad17686aa9faba183f1bb3a2237c7e6b5d40af /locale
parent2a63199095b7f9f4881787876d29a17c971f87f0 (diff)
downloadglibc-45c952394b49a40b456ed049b3dc305ec07de576.tar.gz
glibc-45c952394b49a40b456ed049b3dc305ec07de576.tar.xz
glibc-45c952394b49a40b456ed049b3dc305ec07de576.zip
Update.
	* locale/programs/ld-ctype.c: Handle SP and space consistently.
Diffstat (limited to 'locale')
-rw-r--r--locale/programs/ld-ctype.c10
1 files changed, 10 insertions, 0 deletions
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)
 	{