diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-06-26 00:26:21 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-06-26 00:26:21 +0000 |
| commit | 8b682b9907ad1d60bdd45431e0e3bbdf358837ec (patch) | |
| tree | 6ec38a6f3aac595638af0fb14ec497a7a9c83b16 /locale | |
| parent | 45a9eda2f9b8245d1586ceb51bb3543fc2a2a9f6 (diff) | |
Update.
* iconvdata/gen-8bit-gap-1.sh: Update for new charmap format.
* iconvdata/gen-8bit-gap.sh: Likewise.
* iconvdata/gen-8bit.sh: Likewise.
* iconv/gconv_open.c (__gconv_open): Move comment to correct position.
* locale/programs/ld-collate.c (collate_read): Don't actually read
the copy locale if we are ignoring the content.
* sunrpc/xdr_rec.c (set_input_fragment): Fix PR libc/1549, patch from
Jens Moeller <jens.moeller@waii.com>.
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/programs/ld-collate.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index 205cf966f2..73a186df26 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -2696,14 +2696,17 @@ collate_read (struct linereader *ldfile, struct localedef_t *result, return; } - /* Get the locale definition. */ - copy_locale = load_locale (LC_COLLATE, now->val.str.startmb, - repertoire_name, charmap, NULL); - if ((copy_locale->avail & COLLATE_LOCALE) == 0) + if (! ignore_content) { - /* Not yet loaded. So do it now. */ - if (locfile_read (copy_locale, charmap) != 0) - goto skip_category; + /* Get the locale definition. */ + copy_locale = load_locale (LC_COLLATE, now->val.str.startmb, + repertoire_name, charmap, NULL); + if ((copy_locale->avail & COLLATE_LOCALE) == 0) + { + /* Not yet loaded. So do it now. */ + if (locfile_read (copy_locale, charmap) != 0) + goto skip_category; + } } lr_ignore_rest (ldfile, 1); |