Update.

	* locale/programs/ld-collate.c (check_duplicate): Allow repertoire
	to be missing.

diff --git a/ChangeLog b/ChangeLog
index 92a8849cfe2ba6dad7f5bfb39f3b3871e6fead8d..42b51ea8549db22188fc9da1f5237693fafa89d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-04-01  Ulrich Drepper  <drepper@redhat.com>
 
+       * locale/programs/ld-collate.c (check_duplicate): Allow repertoire
+       to be missing.
+
        * sysdeps/unix/sysv/linux/init-first.c (init): Add code from
        former init-first.h.  Initialize __libc_multiple_libcs.
 

diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index aee98df13a5f1b840b0f7b873f42ca1137af0de4..9b9db42de96a6e88c12b55d75acff83ccd93e211 100644 (file)
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -347,7 +347,9 @@ check_duplicate (struct linereader *ldfile, struct locale_collate_t *collate,
       return 1;
     }
 
-  if (find_entry (&repertoire->char_table, symbol, symbol_len, &ignore) == 0)
+  if (repertoire != NULL
+      && (find_entry (&repertoire->char_table, symbol, symbol_len, &ignore)
+         == 0))
     {
       lr_error (ldfile, _("`%.*s' already defined in repertoire"),
                (int) symbol_len, symbol);