From: Bruno Haible <bruno@clisp.org>
Date: Sat, 14 May 2005 12:52:21 +0000 (+0000)
Subject: glibc 2003-09-04  Ulrich Drepper  <drepper@redhat.com>
X-Git-Tag: v0.15~524
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c3cba2ce285e671e241e2794caba02a379b25e1;p=thirdparty%2Fgettext.git

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 1b6d89e25..0d6667176 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 c05fbc7f4..266ff4bdc 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;