glibc 2003-09-04 Ulrich Drepper <drepper@redhat.com>

and   2005-05-05  Bruno Haible  <bruno@clisp.org>

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 1b6d89e2595f9c2384b385d3e4ca7e8247e7c04a..0d66671764ef775b02d0874e36f2bd35a8b8c377 100644 (file)
--- 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 c05fbc7f460caad85a50b40916ea7eb72f29f307..266ff4bdc5e3e748e6fe065fee3d93776afb21ae 100644 (file)
--- 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;