Update.

	* locale/programs/ld-ctype.c: Handle SP and space consistently.

diff --git a/ChangeLog b/ChangeLog
index 555199c8a307647bb88e0a6aa12e257399f98da6..fdf06f0cd2e884a441631dd0ef9ca731bb8b41a0 100644 (file)
--- 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 8bef3ee7cad47c6b13be445f3ea3b55a5c4d467e..be735e379618de4ac75ca0d8dc99e2d0bb74cc1e 100644 (file)
--- 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)
@@ -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)