diff options
| author | Bruno Haible <bruno@clisp.org> | 2005-05-14 12:52:21 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:12:34 +0200 |
| commit | 9c3cba2ce285e671e241e2794caba02a379b25e1 (patch) | |
| tree | 1731c2e9772e7589a15716bf8210ae7498db8615 /gettext-runtime | |
| parent | 59a7d13c71b03dee066424e32816bfb0098972f2 (diff) | |
| download | external_gettext-9c3cba2ce285e671e241e2794caba02a379b25e1.zip external_gettext-9c3cba2ce285e671e241e2794caba02a379b25e1.tar.gz external_gettext-9c3cba2ce285e671e241e2794caba02a379b25e1.tar.bz2 | |
glibc 2003-09-04 Ulrich Drepper <drepper@redhat.com>
and 2005-05-05 Bruno Haible <bruno@clisp.org>
Diffstat (limited to 'gettext-runtime')
| -rw-r--r-- | gettext-runtime/intl/ChangeLog | 8 | ||||
| -rw-r--r-- | gettext-runtime/intl/localealias.c | 8 |
2 files changed, 15 insertions, 1 deletions
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 <bruno@clisp.org> + + * localealias.c (read_alias_file): Limit last patch to _LIBC case. + +2003-09-04 Ulrich Drepper <drepper@redhat.com> + + * localealias.c (read_alias_file): Use fopen with 'c' mode flag. + 2003-09-03 Jakub Jelinek <jakub@redhat.com> * 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; |