* locale/programs/localedef.c (add_to_readlist): Error about

	circular dependencies only if the locale in question hasn't
	been finished.
	* locale/programs/linereader.c (get_string): Pass LC_CTYPE not
	CTYPE_LOCALE to load_locale.
	* locale/programs/locfile.c (locfile_read): Don't include
	unneeded but available locales in locale_mask.

	* locale/programs/locarchive.c (enlarge_archive): If quiet, don't
	print any messages about enlarging archive.

diff --git a/ChangeLog b/ChangeLog
index 4dfcd2c..90d4f62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-08-15  Jakub Jelinek  <jakub@redhat.com>
+
+       * locale/programs/localedef.c (add_to_readlist): Error about
+       circular dependencies only if the locale in question hasn't
+       been finished.
+       * locale/programs/linereader.c (get_string): Pass LC_CTYPE not
+       CTYPE_LOCALE to load_locale.
+       * locale/programs/locfile.c (locfile_read): Don't include
+       unneeded but available locales in locale_mask.
+
+       * locale/programs/locarchive.c (enlarge_archive): If quiet, don't
+       print any messages about enlarging archive.
+
 2002-08-20 Brian Youmans <3diff@gnu.org>
 
         * manual/contrib.texi: Removed licenses, added acknowledgements

diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c
index f569d1b..e216165 100644 (file)
--- a/locale/programs/linereader.c
+++ b/locale/programs/linereader.c
@@ -735,7 +735,7 @@ non-symbolic character value should not be used"));
                                  int old_needed = locale->needed;
 
                                  locale->needed = 0;
-                                 locale = load_locale (CTYPE_LOCALE,
+                                 locale = load_locale (LC_CTYPE,
                                                        locale->name,
                                                        locale->repertoire_name,
                                                        charmap, locale);

diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index 5bbf0bf..64b1d44 100644 (file)
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -561,7 +561,9 @@ add_to_readlist (int locale, const char *name, const char *repertoire_name,
        }
     }
 
-  if (generate && (runp->needed & (1 << locale)) != 0)
+  if (generate
+      && (runp->needed & (1 << locale)) != 0
+      && (runp->avail & (1 << locale)) == 0)
     WITH_CUR_LOCALE (error (5, 0, _("\
 circular dependencies between locale definitions")));
 

diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
index ea2cf82..4983214 100644 (file)
--- a/locale/programs/locarchive.c
+++ b/locale/programs/locarchive.c
@@ -259,8 +259,9 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head)
      should be double from what is currently used.  */
   newhead.namehash_size = MAX (next_prime (2 * newhead.namehash_used),
                               newhead.namehash_size);
-  printf ("name: size: %u, used: %d, new: size: %u\n",
-         head->namehash_size, head->namehash_used, newhead.namehash_size);
+  if (! be_quiet)
+    printf ("name: size: %u, used: %d, new: size: %u\n",
+           head->namehash_size, head->namehash_used, newhead.namehash_size);
 
   newhead.string_offset = (newhead.namehash_offset
                           + (newhead.namehash_size

diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c
index 389adf1..c5e5581 100644 (file)
--- a/locale/programs/locfile.c
+++ b/locale/programs/locfile.c
@@ -47,7 +47,7 @@ locfile_read (struct localedef_t *result, const struct charmap_t *charmap)
 {
   const char *filename = result->name;
   const char *repertoire_name = result->repertoire_name;
-  int locale_mask = result->needed ^ result->avail;
+  int locale_mask = result->needed & ~result->avail;
   struct linereader *ldfile;
   int not_here = ALL_LOCALES;
 

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index abefa10..1f2f690 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-15  Jakub Jelinek  <jakub@redhat.com>
+
+       * charmaps/BIG5-HKSCS (WIDTH): Change <UE000> to <UE003> at start of
+       range.
+
 2002-08-09  Roland McGrath  <roland@redhat.com>
 
        * Makefile ($(INSTALL-SUPPORTED-LOCALES)): Pass --alias-file option to

diff --git a/localedata/charmaps/BIG5-HKSCS b/localedata/charmaps/BIG5-HKSCS
index abd313f..b6f55b4 100644 (file)
--- a/localedata/charmaps/BIG5-HKSCS
+++ b/localedata/charmaps/BIG5-HKSCS
@@ -18309,5 +18309,5 @@ WIDTH
 <U30FD>...<U30F6> 2
 <UF7E5>...<U2EE3> 2
 <U7881>...<U256F> 2
-<UE000>...<U79D4> 2
+<UE003>...<U79D4> 2
 END WIDTH