diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-04-01 17:53:24 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-04-01 17:53:24 +0000 |
| commit | 289e8e7ea11afad41aaac7d43400bf4ee28aada5 (patch) | |
| tree | 58ba2801914541a019b86661d42b50affba2aecb | |
| parent | 0adb8e479b6222c81376575bbe2d1b9b4f7e03cd (diff) | |
| download | glibc-289e8e7ea11afad41aaac7d43400bf4ee28aada5.tar.gz glibc-289e8e7ea11afad41aaac7d43400bf4ee28aada5.tar.xz glibc-289e8e7ea11afad41aaac7d43400bf4ee28aada5.zip | |
Update.
* locale/programs/ld-collate.c (check_duplicate): Allow repertoire to be missing.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | locale/programs/ld-collate.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 92a8849cfe..42b51ea854 100644 --- 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 aee98df13a..9b9db42de9 100644 --- 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); |