diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | debug/fprintf_chk.c | 4 | ||||
| -rw-r--r-- | debug/fwprintf_chk.c | 4 | ||||
| -rw-r--r-- | debug/printf_chk.c | 4 | ||||
| -rw-r--r-- | debug/vfprintf_chk.c | 4 | ||||
| -rw-r--r-- | debug/vfwprintf_chk.c | 4 | ||||
| -rw-r--r-- | debug/vprintf_chk.c | 4 | ||||
| -rw-r--r-- | debug/vwprintf_chk.c | 4 | ||||
| -rw-r--r-- | debug/wprintf_chk.c | 4 | ||||
| -rw-r--r-- | libio/libioP.h | 10 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/bits/stdio-lock.h | 10 |
11 files changed, 48 insertions, 20 deletions
@@ -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 58b5fb2b3e..77c50311f7 100644 --- 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 710c89f3c8..b7e3494c7d 100644 --- 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 b8f00965dc..7bea9f6b06 100644 --- 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 bd2796eaf7..7146986d5e 100644 --- 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 a2612d53e9..f0ae041c2e 100644 --- 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 68a63ee7f9..68ff4909ba 100644 --- 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 3b959b2968..48306a7438 100644 --- 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 e0a82617ad..ef60f8a9f8 100644 --- 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 a574b40f77..b99b81743f 100644 --- 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 cd64bc37e2..5f2382104b 100644 --- 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) |