mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-15 04:20:28 +08:00
4e2f43f842
The _chk variants of all of the printf functions become much simpler.
This is the last thing that we needed _IO_acquire_lock_clear_flags2
for, so it can go as well. I took the opportunity to make the headers
included and the names of all local variables consistent across all the
affected files.
Since we ultimately want to get rid of __no_long_double as well, it
must be possible to get all of the nontrivial effects of the _chk
functions by calling the _internal functions with appropriate flags.
For most of the __(v)xprintf_chk functions, this is covered by
PRINTF_FORTIFY plus some up-front argument checks that can be
duplicated. However, __(v)sprintf_chk installs a custom jump table so
that it can crash instead of overflowing the output buffer. This
functionality is moved to __vsprintf_internal, which now has a
'maxlen' argument like __vsnprintf_internal; to get the unsafe
behavior of ordinary (v)sprintf, pass -1 for that argument.
obstack_printf_chk and obstack_vprintf_chk are no longer in the same
file.
As a side-effect of the unification of both fortified and non-fortified
vdprintf initialization, this patch fixes bug 11319 for __dprintf_chk
and __vdprintf_chk, which was previously fixed only for dprintf and
vdprintf by the commit
commit 7ca890b88e
Author: Ulrich Drepper <drepper@redhat.com>
Date: Wed Feb 24 16:07:57 2010 -0800
Fix reporting of I/O errors in *dprintf functions.
This patch adds a test case to avoid regressions.
Tested for powerpc and powerpc64le.
65 lines
2.3 KiB
C
65 lines
2.3 KiB
C
/* Thread package specific definitions of stream lock type. Generic version.
|
|
Copyright (C) 2000-2018 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
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _STDIO_LOCK_H
|
|
#define _STDIO_LOCK_H 1
|
|
|
|
#include <libc-lock.h>
|
|
|
|
__libc_lock_define_recursive (typedef, _IO_lock_t)
|
|
#define _IO_lock_t_defined 1
|
|
|
|
/* We need recursive (counting) mutexes. */
|
|
#ifdef _LIBC_LOCK_RECURSIVE_INITIALIZER
|
|
# define _IO_lock_initializer _LIBC_LOCK_RECURSIVE_INITIALIZER
|
|
#elif _IO_MTSAFE_IO
|
|
#error libio needs recursive mutexes for _IO_MTSAFE_IO
|
|
#endif
|
|
|
|
#define _IO_lock_init(_name) __libc_lock_init_recursive (_name)
|
|
#define _IO_lock_fini(_name) __libc_lock_fini_recursive (_name)
|
|
#define _IO_lock_lock(_name) __libc_lock_lock_recursive (_name)
|
|
#define _IO_lock_trylock(_name) __libc_lock_trylock_recursive (_name)
|
|
#define _IO_lock_unlock(_name) __libc_lock_unlock_recursive (_name)
|
|
|
|
|
|
#define _IO_cleanup_region_start(_fct, _fp) \
|
|
__libc_cleanup_region_start (((_fp)->_flags & _IO_USER_LOCK) == 0, _fct, _fp)
|
|
#define _IO_cleanup_region_start_noarg(_fct) \
|
|
__libc_cleanup_region_start (1, _fct, NULL)
|
|
#define _IO_cleanup_region_end(_doit) \
|
|
__libc_cleanup_region_end (_doit)
|
|
|
|
#if defined _LIBC && IS_IN (libc)
|
|
|
|
# ifdef __EXCEPTIONS
|
|
# define _IO_acquire_lock(_fp) \
|
|
do { \
|
|
FILE *_IO_acquire_lock_file \
|
|
__attribute__((cleanup (_IO_acquire_lock_fct))) \
|
|
= (_fp); \
|
|
_IO_flockfile (_IO_acquire_lock_file);
|
|
# else
|
|
# define _IO_acquire_lock(_fp) _IO_acquire_lock_needs_exceptions_enabled
|
|
# endif
|
|
# define _IO_release_lock(_fp) ; } while (0)
|
|
|
|
#endif
|
|
|
|
#endif /* stdio-lock.h */
|