qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* locale/programs/ld-collate.c (check_duplicate): Allow repertoire
	to be missing.
This commit is contained in:
Ulrich Drepper 2000-04-01 17:53:24 +00:00
parent 0adb8e479b
commit 289e8e7ea1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2000-04-01 Ulrich Drepper <drepper@redhat.com> 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 * sysdeps/unix/sysv/linux/init-first.c (init): Add code from
former init-first.h. Initialize __libc_multiple_libcs. former init-first.h. Initialize __libc_multiple_libcs.

4
locale/programs/ld-collate.c
View File

@ -347,7 +347,9 @@ check_duplicate (struct linereader *ldfile, struct locale_collate_t *collate,
return 1; 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"), lr_error (ldfile, _("`%.*s' already defined in repertoire"),
(int) symbol_len, symbol); (int) symbol_len, symbol);