* libio/libioP.h (_IO_acquire_lock_clear_flags2_fct): New function.

	* debug/vfwprintf_chk.c (__vfwprintf_chk): Use
	_IO_acquire_lock_clear_flags2 instead of _IO_acquire_lock.
	* debug/vprintf_chk.c (__vprintf_chk): Likewise.
	* debug/vwprintf_chk.c (__vwprintf_chk): Likewise.
	* debug/vfprintf_chk.c (__vfprintf_chk): Likewise.
	* debug/fwprintf_chk.c (__fwprintf_chk): Likewise.
	* debug/printf_chk.c (__printf_chk): Likewise.
	* debug/fprintf_chk.c (__fprintf_chk): Likewise.
	* debug/wprintf_chk.c (__wprintf_chk): Likewise.

	* sysdeps/pthread/bits/stdio-lock.h (_IO_acquire_lock_clear_flags2):
	Define.

diff --git a/ChangeLog b/ChangeLog
index 4fa39d277ed0467e9d4b4a3a6b30ee77062104e4..208ca7e0687fc8bdbd68a7fd7741c36f667a4fc0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2007-07-17  Jakub Jelinek  <jakub@redhat.com>
 
+       * libio/libioP.h (_IO_acquire_lock_clear_flags2_fct): New function.
+       * debug/vfwprintf_chk.c (__vfwprintf_chk): Use
+       _IO_acquire_lock_clear_flags2 instead of _IO_acquire_lock.
+       * debug/vprintf_chk.c (__vprintf_chk): Likewise.
+       * debug/vwprintf_chk.c (__vwprintf_chk): Likewise.
+       * debug/vfprintf_chk.c (__vfprintf_chk): Likewise.
+       * debug/fwprintf_chk.c (__fwprintf_chk): Likewise.
+       * debug/printf_chk.c (__printf_chk): Likewise.
+       * debug/fprintf_chk.c (__fprintf_chk): Likewise.
+       * debug/wprintf_chk.c (__wprintf_chk): Likewise.
+
+       * sysdeps/pthread/bits/stdio-lock.h (_IO_acquire_lock_clear_flags2):
+       Define.
+
        * bits/confname.h (_CS_POSIX_V6_WIDTH_RESTRICTED_ENVS): Define.
        * posix/getconf.c (vars): Add POSIX_V6_WIDTH_RESTRICTED_ENVS.
 
@@ -9,8 +23,6 @@
        * stdlib/stdlib.h (realloc): Remove __attribute_malloc__.
        * malloc/malloc.h (realloc): Likewise.
 
-2007-07-16  Jakub Jelinek  <jakub@redhat.com>
-
        * libio/iopopen.c (_IO_new_proc_open): Don't close child_std_end
        if one of proc_file_chain streams has that fileno.
        * stdio-common/Makefile (tests): Add tst-popen2.

diff --git a/debug/fprintf_chk.c b/debug/fprintf_chk.c
index 58b5fb2b3ee014e3aad021a5681b2f1cb6e84c74..77c50311f7c4d4b1e492acb559757a2eb980bc03 100644 (file)
--- a/debug/fprintf_chk.c
+++ b/debug/fprintf_chk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004, 2006
+/* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004, 2006, 2007
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -29,7 +29,7 @@ ___fprintf_chk (FILE *fp, int flag, const char *format, ...)
   va_list ap;
   int done;
 
-  _IO_acquire_lock (fp);
+  _IO_acquire_lock_clear_flags2 (fp);
   if (flag > 0)
     fp->_flags2 |= _IO_FLAGS2_FORTIFY;
 

diff --git a/debug/fwprintf_chk.c b/debug/fwprintf_chk.c
index 710c89f3c8ae5ff6cd467f9d0f26a167c99eb01c..b7e3494c7d961549cf003cde673880e3cacd06ac 100644 (file)
--- a/debug/fwprintf_chk.c
+++ b/debug/fwprintf_chk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004, 2005
+/* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004, 2005, 2007
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -29,7 +29,7 @@ __fwprintf_chk (FILE *fp, int flag, const wchar_t *format, ...)
   va_list ap;
   int done;
 
-  _IO_acquire_lock (fp);
+  _IO_acquire_lock_clear_flags2 (fp);
   if (flag > 0)
     fp->_flags2 |= _IO_FLAGS2_FORTIFY;
 

diff --git a/debug/printf_chk.c b/debug/printf_chk.c
index b8f00965dcb8df506ea9ede9e2347ab617c658c3..7bea9f6b061fe45f548952f11df799067d61aeae 100644 (file)
--- a/debug/printf_chk.c
+++ b/debug/printf_chk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004, 2006
+/* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004, 2006, 2007
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -29,7 +29,7 @@ ___printf_chk (int flag, const char *format, ...)
   va_list ap;
   int done;
 
-  _IO_acquire_lock (stdout);
+  _IO_acquire_lock_clear_flags2 (stdout);
   if (flag > 0)
     stdout->_flags2 |= _IO_FLAGS2_FORTIFY;
 

diff --git a/debug/vfprintf_chk.c b/debug/vfprintf_chk.c
index bd2796eaf79b15b44962d18365fe25900a31251d..7146986d5e0608228c563af09c7c9959ce2674fb 100644 (file)
--- a/debug/vfprintf_chk.c
+++ b/debug/vfprintf_chk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004, 2005, 2006
+/* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -28,7 +28,7 @@ ___vfprintf_chk (FILE *fp, int flag, const char *format, va_list ap)
 {
   int done;
 
-  _IO_acquire_lock (fp);
+  _IO_acquire_lock_clear_flags2 (fp);
   if (flag > 0)
     fp->_flags2 |= _IO_FLAGS2_FORTIFY;
 

diff --git a/debug/vfwprintf_chk.c b/debug/vfwprintf_chk.c
index a2612d53e935b9f9f745b3b1dfc78779ec22f037..f0ae041c2ef27960ebad355a28db72cb8122fe3b 100644 (file)
--- a/debug/vfwprintf_chk.c
+++ b/debug/vfwprintf_chk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004, 2005, 2006
+/* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -28,7 +28,7 @@ __vfwprintf_chk (FILE *fp, int flag, const wchar_t *format, va_list ap)
 {
   int done;
 
-  _IO_acquire_lock (fp);
+  _IO_acquire_lock_clear_flags2 (fp);
   if (flag > 0)
     fp->_flags2 |= _IO_FLAGS2_FORTIFY;
 

diff --git a/debug/vprintf_chk.c b/debug/vprintf_chk.c
index 68a63ee7f9b9bfaf9580bac468815e06c06ee79c..68ff4909ba5acf6ce4d218f188c80a1819ca7ce8 100644 (file)
--- a/debug/vprintf_chk.c
+++ b/debug/vprintf_chk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004, 2006
+/* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004, 2006, 2007
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -28,7 +28,7 @@ ___vprintf_chk (int flag, const char *format, va_list ap)
 {
   int done;
 
-  _IO_acquire_lock (stdout);
+  _IO_acquire_lock_clear_flags2 (stdout);
   if (flag > 0)
     stdout->_flags2 |= _IO_FLAGS2_FORTIFY;
 

diff --git a/debug/vwprintf_chk.c b/debug/vwprintf_chk.c
index 3b959b2968a8f9919af54f9628f33727c296aa87..48306a7438422e0a4709fa6d6c40a1f68cd3befa 100644 (file)
--- a/debug/vwprintf_chk.c
+++ b/debug/vwprintf_chk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004, 2005
+/* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004, 2005, 2007
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -29,7 +29,7 @@ __vwprintf_chk (int flag, const wchar_t *format, va_list ap)
 {
   int done;
 
-  _IO_acquire_lock (stdout);
+  _IO_acquire_lock_clear_flags2 (stdout);
   if (flag > 0)
     stdout->_flags2 |= _IO_FLAGS2_FORTIFY;
 

diff --git a/debug/wprintf_chk.c b/debug/wprintf_chk.c
index e0a82617addeba4b2f14f83f1dc9569dc130af10..ef60f8a9f8b1b4249cbdc91a7df49c5cd9b1cce6 100644 (file)
--- a/debug/wprintf_chk.c
+++ b/debug/wprintf_chk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004, 2005
+/* Copyright (C) 1991, 1995, 1996, 1997, 2001, 2004, 2005, 2007
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -30,7 +30,7 @@ __wprintf_chk (int flag, const wchar_t *format, ...)
   va_list ap;
   int done;
 
-  _IO_acquire_lock (stdout);
+  _IO_acquire_lock_clear_flags2 (stdout);
   if (flag > 0)
     stdout->_flags2 |= _IO_FLAGS2_FORTIFY;
 

diff --git a/libio/libioP.h b/libio/libioP.h
index a574b40f777bf495c618d078b0b0944792b5d1ac..b99b81743fd1cf7aae04f142e1e1385231984382 100644 (file)
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -968,3 +968,13 @@ _IO_acquire_lock_fct (_IO_FILE **p)
   if ((fp->_flags & _IO_USER_LOCK) == 0)
     _IO_funlockfile (fp);
 }
+
+static inline void
+__attribute__ ((__always_inline__))
+_IO_acquire_lock_clear_flags2_fct (_IO_FILE **p)
+{
+  _IO_FILE *fp = *p;
+  fp->_flags &= ~_IO_FLAGS2_FORTIFY;
+  if ((fp->_flags & _IO_USER_LOCK) == 0)
+    _IO_funlockfile (fp);
+}

diff --git a/nptl/sysdeps/pthread/bits/stdio-lock.h b/nptl/sysdeps/pthread/bits/stdio-lock.h
index cd64bc37e2a9ae62c4ae99fc4fe651222405b76e..5f2382104be957f15cda9aa3f37c0ce4a1d80f4a 100644 (file)
--- a/nptl/sysdeps/pthread/bits/stdio-lock.h
+++ b/nptl/sysdeps/pthread/bits/stdio-lock.h
@@ -1,5 +1,5 @@
 /* Thread package specific definitions of stream lock type.  NPTL version.
-   Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -94,9 +94,15 @@ typedef struct { int lock; int cnt; void *owner; } _IO_lock_t;
        __attribute__((cleanup (_IO_acquire_lock_fct)))                       \
        = (_fp);                                                              \
     _IO_flockfile (_IO_acquire_lock_file);
-
+#  define _IO_acquire_lock_clear_flags2(_fp) \
+  do {                                                                       \
+    _IO_FILE *_IO_acquire_lock_file                                          \
+       __attribute__((cleanup (_IO_acquire_lock_clear_flags2_fct)))          \
+       = (_fp);                                                              \
+    _IO_flockfile (_IO_acquire_lock_file);
 # else
 #  define _IO_acquire_lock(_fp) _IO_acquire_lock_needs_exceptions_enabled
+#  define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp)
 # endif
 # define _IO_release_lock(_fp) ; } while (0)