diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-08-28 19:19:33 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-08-28 19:19:33 +0000 |
| commit | 2455d11258712bbab8a52c7951301924a483a295 (patch) | |
| tree | 3677c7e4c7ba3c4197a0d21734e53749d04ddfff /locale/programs/ld-collate.c | |
| parent | 0afdbd1873d970cfaa724d7d49226685a07d6f05 (diff) | |
Updated to fedora-glibc-20060828T1903cvs/fedora-glibc-2_4_90-26
Diffstat (limited to 'locale/programs/ld-collate.c')
| -rw-r--r-- | locale/programs/ld-collate.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index 66638d50c8..e69ac85a95 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2002, 2003, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1995-2002, 2003, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -2671,6 +2671,9 @@ collate_read (struct linereader *ldfile, struct localedef_t *result, if (locfile_read (copy_locale, charmap) != 0) goto skip_category; } + + if (copy_locale->categories[LC_COLLATE].collate == NULL) + return; } lr_ignore_rest (ldfile, 1); |