diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-08-28 16:24:10 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-08-28 16:24:10 +0000 |
| commit | 6e31011191823a5d7dc65632f4be8a87fcf0779b (patch) | |
| tree | 966cd58c385575fbe94afea770a16bffa90e169f /locale | |
| parent | 07014fcacd42d0d3a3178cb7f6b498284ae9b2c0 (diff) | |
| download | glibc-6e31011191823a5d7dc65632f4be8a87fcf0779b.tar.gz glibc-6e31011191823a5d7dc65632f4be8a87fcf0779b.tar.xz glibc-6e31011191823a5d7dc65632f4be8a87fcf0779b.zip | |
* inet/getnameinfo.c (getnameinfo): For AF_INET, check errno cvs/fedora-glibc-20060828T1903
only if herrno is NETDB_INTERNAL. Handle errors other than ERANGE outside of the loops, handle TRY_AGAIN. * locale/programs/ld-ctype.c (translit_flatten): Issue error if other's ctype category was missing. * locale/programs/ld-collate.c (collate_read): Return if copy_locale's collate category is missing.
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/programs/ld-collate.c | 5 | ||||
| -rw-r--r-- | locale/programs/ld-ctype.c | 2 |
2 files changed, 5 insertions, 2 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); diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index a42b6f184d..b1a28b9280 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -3769,7 +3769,7 @@ translit_flatten (struct locale_ctype_t *ctype, other = find_locale (LC_CTYPE, copy_locale, copy_repertoire, charmap); - if (other == NULL) + if (other == NULL || other->categories[LC_CTYPE].ctype == NULL) { WITH_CUR_LOCALE (error (0, 0, _("\ %s: transliteration data from locale `%s' not available"), |