mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
6cc8844f1d
from definition. * sysdeps/x86_64/dl-machine.h (elf_machine_rela): Don't define label if it is not used. * elf/dl-profile.c (_dl_start_profile): Define real-type variant of gmon_hist_hdr and gmon_hdr structures and use them. * elf/dl-load.c (open_verify): Add temporary variable to avoid warning. * nscd/nscd_helper.c (get_mapping): Avoid casts to avoid warnings. * sunrpc/clnt_raw.c (clntraw_private_s): Use union in definition to avoid cast. * inet/rexec.c (rexec_af): Make sa2 a union to avoid warnings. * inet/rcmd.c (rcmd_af): Make from a union of the various needed types to avoid warnings. (iruserok_af): Use ss_family instead of casts. * gmon/gmon.c (write_hist): Define real-type variant of gmon_hist_hdr structure and use it. (write_gmon): Likewise for gmon_hdr. * sysdeps/unix/sysv/linux/readv.c: Avoid declaration of replacement function if we are not going to define it. * sysdeps/unix/sysv/linux/writev.c: Likewise. * inet/inet6_option.c (optin_alloc): Add temporary variable to avoid warning. * libio/strfile.h (struct _IO_streambuf): Use correct type and name of VTable element. * libio/iovsprintf.c: Avoid casts to avoid warnings. * libio/iovsscanf.c: Likewise. * libio/vasprintf.c: Likewise. * libio/vsnprintf.c: Likewise. * stdio-common/isoc99_vsscanf.c: Likewise. * stdlib/strfmon_l.c: Likewise. * debug/vasprintf_chk.c: Likewise. * debug/vsnprintf_chk.c: Likewise. * debug/vsprintf_chk.c: Likewise.
94 lines
2.8 KiB
C
94 lines
2.8 KiB
C
/* Copyright (C) 1994, 1997, 1999-2003, 2004, 2006, 2009
|
|
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, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include "../libio/libioP.h"
|
|
#include "../libio/strfile.h"
|
|
|
|
|
|
static int _IO_str_chk_overflow (_IO_FILE *fp, int c) __THROW;
|
|
|
|
static int
|
|
_IO_str_chk_overflow (fp, c)
|
|
_IO_FILE *fp;
|
|
int c;
|
|
{
|
|
/* When we come to here this means the user supplied buffer is
|
|
filled. */
|
|
__chk_fail ();
|
|
}
|
|
|
|
|
|
static const struct _IO_jump_t _IO_str_chk_jumps =
|
|
{
|
|
JUMP_INIT_DUMMY,
|
|
JUMP_INIT(finish, _IO_str_finish),
|
|
JUMP_INIT(overflow, _IO_str_chk_overflow),
|
|
JUMP_INIT(underflow, INTUSE(_IO_str_underflow)),
|
|
JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
|
|
JUMP_INIT(pbackfail, INTUSE(_IO_str_pbackfail)),
|
|
JUMP_INIT(xsputn, INTUSE(_IO_default_xsputn)),
|
|
JUMP_INIT(xsgetn, INTUSE(_IO_default_xsgetn)),
|
|
JUMP_INIT(seekoff, INTUSE(_IO_str_seekoff)),
|
|
JUMP_INIT(seekpos, _IO_default_seekpos),
|
|
JUMP_INIT(setbuf, _IO_default_setbuf),
|
|
JUMP_INIT(sync, _IO_default_sync),
|
|
JUMP_INIT(doallocate, INTUSE(_IO_default_doallocate)),
|
|
JUMP_INIT(read, _IO_default_read),
|
|
JUMP_INIT(write, _IO_default_write),
|
|
JUMP_INIT(seek, _IO_default_seek),
|
|
JUMP_INIT(close, _IO_default_close),
|
|
JUMP_INIT(stat, _IO_default_stat),
|
|
JUMP_INIT(showmanyc, _IO_default_showmanyc),
|
|
JUMP_INIT(imbue, _IO_default_imbue)
|
|
};
|
|
|
|
|
|
int
|
|
___vsprintf_chk (char *s, int flags, size_t slen, const char *format,
|
|
va_list args)
|
|
{
|
|
_IO_strfile f;
|
|
int ret;
|
|
#ifdef _IO_MTSAFE_IO
|
|
f._sbf._f._lock = NULL;
|
|
#endif
|
|
|
|
if (slen == 0)
|
|
__chk_fail ();
|
|
|
|
_IO_no_init (&f._sbf._f, _IO_USER_LOCK, -1, NULL, NULL);
|
|
_IO_JUMPS (&f._sbf) = &_IO_str_chk_jumps;
|
|
s[0] = '\0';
|
|
_IO_str_init_static_internal (&f, s, slen - 1, s);
|
|
|
|
/* For flags > 0 (i.e. __USE_FORTIFY_LEVEL > 1) request that %n
|
|
can only come from read-only format strings. */
|
|
if (flags > 0)
|
|
f._sbf._f._flags2 |= _IO_FLAGS2_FORTIFY;
|
|
|
|
ret = INTUSE(_IO_vfprintf) (&f._sbf._f, format, args);
|
|
|
|
*f._sbf._f._IO_write_ptr = '\0';
|
|
return ret;
|
|
}
|
|
ldbl_hidden_def (___vsprintf_chk, __vsprintf_chk)
|
|
ldbl_strong_alias (___vsprintf_chk, __vsprintf_chk)
|