Use O_CLOEXEC in tzfile handling

diff --git a/ChangeLog b/ChangeLog
index cbbf592..054fbc2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-14  Ulrich Drepper  <drepper@gmail.com>
+
+       * time/tzfile.c (__tzfile_read): Use "e" in fopen call.
+
 2011-11-14  Andreas Schwab  <schwab@redhat.com>
 
        * malloc/arena.c (arena_get2): Don't call reused_arena when

diff --git a/time/tzfile.c b/time/tzfile.c
index f4cba46..144e20b 100644 (file)
--- a/time/tzfile.c
+++ b/time/tzfile.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993,1995-2001,2003,2004,2006,2007,2009
+/* Copyright (C) 1991-1993,1995-2001,2003,2004,2006,2007,2009,2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -178,8 +178,8 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
     }
 
   /* Note the file is opened with cancellation in the I/O functions
-     disabled.  */
-  f = fopen (file, "rc");
+     disabled and if available FD_CLOEXEC set.  */
+  f = fopen (file, "rce");
   if (f == NULL)
     goto ret_free_transitions;