From 9c3cba2ce285e671e241e2794caba02a379b25e1 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 14 May 2005 12:52:21 +0000 Subject: glibc 2003-09-04 Ulrich Drepper and 2005-05-05 Bruno Haible --- gettext-runtime/intl/ChangeLog | 8 ++++++++ gettext-runtime/intl/localealias.c | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'gettext-runtime') diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 1b6d89e..0d66671 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,11 @@ +2005-05-05 Bruno Haible + + * localealias.c (read_alias_file): Limit last patch to _LIBC case. + +2003-09-04 Ulrich Drepper + + * localealias.c (read_alias_file): Use fopen with 'c' mode flag. + 2003-09-03 Jakub Jelinek * loadmsgcat.c (open, close, read, mmap, munmap): Define as diff --git a/gettext-runtime/intl/localealias.c b/gettext-runtime/intl/localealias.c index c05fbc7..266ff4b 100644 --- a/gettext-runtime/intl/localealias.c +++ b/gettext-runtime/intl/localealias.c @@ -1,5 +1,5 @@ /* Handle aliases for locale names. - Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2001, 2003, 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -230,7 +230,13 @@ read_alias_file (const char *fname, int fname_len) memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile); #endif +#ifdef _LIBC + /* Note the file is opened with cancellation in the I/O functions + disabled. */ + fp = fopen (relocate (full_fname), "rc"); +#else fp = fopen (relocate (full_fname), "r"); +#endif freea (full_fname); if (fp == NULL) return 0; -- cgit v1.1