aboutsummaryrefslogtreecommitdiff
path: root/locale/programs/ld-collate.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-08-28 16:24:10 +0000
committerUlrich Drepper <drepper@redhat.com>2006-08-28 16:24:10 +0000
commit6e31011191823a5d7dc65632f4be8a87fcf0779b (patch)
tree966cd58c385575fbe94afea770a16bffa90e169f /locale/programs/ld-collate.c
parent07014fcacd42d0d3a3178cb7f6b498284ae9b2c0 (diff)
downloadglibc-6e31011191823a5d7dc65632f4be8a87fcf0779b.zip
glibc-6e31011191823a5d7dc65632f4be8a87fcf0779b.tar.gz
glibc-6e31011191823a5d7dc65632f4be8a87fcf0779b.tar.bz2
* inet/getnameinfo.c (getnameinfo): For AF_INET, check errnocvs/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/programs/ld-collate.c')
-rw-r--r--locale/programs/ld-collate.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index 66638d5..e69ac85 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);