* locale/programs/ld-ctype.c (ctype_read): Better patch for read

	failure.

diff --git a/ChangeLog b/ChangeLog
index b95ea69..7680f12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-26  Ulrich Drepper  <drepper@redhat.com>
+
+       * locale/programs/ld-ctype.c (ctype_read): Better patch for read
+       failure.
+
 2006-08-24  Ulrich Drepper  <drepper@redhat.com>
 
        * locale/programs/ld-ctype.c (ctype_read): If CTYPE is NULL, don't

diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index 0ffda62..a42b6f1 100644 (file)
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -2245,6 +2245,9 @@ ctype_read (struct linereader *ldfile, struct localedef_t *result,
              if (locfile_read (copy_locale, charmap) != 0)
                goto skip_category;
            }
+
+         if (copy_locale->categories[LC_CTYPE].ctype == NULL)
+           return;
        }
 
       lr_ignore_rest (ldfile, 1);
@@ -2256,8 +2259,6 @@ ctype_read (struct linereader *ldfile, struct localedef_t *result,
   /* Prepare the data structures.  */
   ctype_startup (ldfile, result, charmap, copy_locale, ignore_content);
   ctype = result->categories[LC_CTYPE].ctype;
-  if (ctype == NULL)
-    return;
 
   /* Remember the repertoire we use.  */
   if (!ignore_content)