mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 15:20:10 +00:00
41d998a683
2000-07-29 Greg McGary <greg@mcgary.org> * Rules (test-bp-inputs, make-test-out): New variables. ($(objpfx)%-bp.out): New rule. ($(objpfx)%.out): Rewrite in terms of new variables. * libio/iovswscanf.c (vswscanf): Pass _IO_FILE_plus pointer to internal function that uses vtable. * libio/vsnprintf.c (_IO_vsnprintf): Likewise. * libio/vswprintf.c (_IO_vswprintf): Likewise. * malloc/malloc.c (mem2chunk): Define in terms of chunk_at_offset. (malloc_extend_top): Convert brk to chunk using chunk_at_offset. (chunk_align): Likewise. * time/asctime.c (ab_day_name, ab_month_name): Rewrite expression in a way that conforms to decl, and avoids spurious bounds violation. * sysdeps/arm/frame.h (struct layout): Make pointers __unbounded. * sysdeps/generic/frame.h: Likewise. * sysdeps/generic/backtrace.c (ADVANCE_STACK_FRAME): Wrap bounds around return value. (__backtrace): Qualify frame-pointer chain and return address pointers as __unbounded. Wrap bounds around variable `current'. * sysdeps/generic/segfault.c (ADVANCE_STACK_FRAME): Wrap bounds around return value. (catch_segfault): Qualify frame-pointer chain and return address pointers as __unbounded. Wrap bounds around variable `current'. * sysdeps/i386/backtrace.c (struct layout): Make pointers __unbounded. (ADVANCE_STACK_FRAME): Wrap bounds around return value. * sysdeps/powerpc/backtrace.c (struct layout): Make pointers __unbounded. (__backtrace): Qualify frame-pointer chain and return address pointers as __unbounded. Wrap bounds around variable `current'. * sysdeps/i386/addmul_1.S: s2_limb is scalar so remove bounds check. * sysdeps/i386/mul_1.S: Likewise. * sysdeps/i386/submul_1.S: Likewise. * sysdeps/i386/i586/addmul_1.S: Likewise. * sysdeps/i386/i586/mul_1.S: Add bounds checks. * sysdeps/i386/i586/submul_1.S: Likewise.
144 lines
4.7 KiB
C
144 lines
4.7 KiB
C
/* Copyright (C) 1994, 1997, 1999, 2000 Free Software Foundation, Inc.
|
|
This file is part of the GNU IO Library.
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License as
|
|
published by the Free Software Foundation; either version 2, or (at
|
|
your option) any later version.
|
|
|
|
This 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
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this library; see the file COPYING. If not, write to
|
|
the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA.
|
|
|
|
As a special exception, if you link this library with files
|
|
compiled with a GNU compiler to produce an executable, this does
|
|
not cause the resulting executable to be covered by the GNU General
|
|
Public License. This exception does not however invalidate any
|
|
other reasons why the executable file might be covered by the GNU
|
|
General Public License. */
|
|
|
|
#include "libioP.h"
|
|
#include "strfile.h"
|
|
|
|
|
|
typedef struct
|
|
{
|
|
_IO_strfile f;
|
|
/* This is used for the characters which do not fit in the buffer
|
|
provided by the user. */
|
|
wchar_t overflow_buf[64];
|
|
} _IO_strnfile;
|
|
|
|
|
|
static wint_t _IO_wstrn_overflow __P ((_IO_FILE *fp, wint_t c));
|
|
|
|
static wint_t
|
|
_IO_wstrn_overflow (fp, c)
|
|
_IO_FILE *fp;
|
|
wint_t c;
|
|
{
|
|
/* When we come to here this means the user supplied buffer is
|
|
filled. But since we must return the number of characters which
|
|
would have been written in total we must provide a buffer for
|
|
further use. We can do this by writing on and on in the overflow
|
|
buffer in the _IO_strnfile structure. */
|
|
_IO_strnfile *snf = (_IO_strnfile *) fp;
|
|
|
|
if (fp->_wide_data->_IO_buf_base != snf->overflow_buf)
|
|
{
|
|
/* Terminate the string. We know that there is room for at
|
|
least one more character since we initialized the stream with
|
|
a size to make this possible. */
|
|
*fp->_wide_data->_IO_write_ptr = '\0';
|
|
|
|
_IO_wsetb (fp, snf->overflow_buf,
|
|
snf->overflow_buf + (sizeof (snf->overflow_buf)
|
|
/ sizeof (wchar_t)), 0);
|
|
|
|
fp->_wide_data->_IO_write_base = snf->overflow_buf;
|
|
fp->_wide_data->_IO_read_base = snf->overflow_buf;
|
|
fp->_wide_data->_IO_read_ptr = snf->overflow_buf;
|
|
fp->_wide_data->_IO_read_end = (snf->overflow_buf
|
|
+ (sizeof (snf->overflow_buf)
|
|
/ sizeof (wchar_t)));
|
|
}
|
|
|
|
fp->_wide_data->_IO_write_ptr = snf->overflow_buf;
|
|
fp->_wide_data->_IO_write_end = snf->overflow_buf;
|
|
|
|
/* Since we are not really interested in storing the characters
|
|
which do not fit in the buffer we simply ignore it. */
|
|
return c;
|
|
}
|
|
|
|
|
|
static struct _IO_jump_t _IO_wstrn_jumps =
|
|
{
|
|
JUMP_INIT_DUMMY,
|
|
JUMP_INIT(finish, _IO_wstr_finish),
|
|
JUMP_INIT(overflow, (_IO_overflow_t) _IO_wstrn_overflow),
|
|
JUMP_INIT(underflow, (_IO_underflow_t) _IO_wstr_underflow),
|
|
JUMP_INIT(uflow, (_IO_underflow_t) _IO_wdefault_uflow),
|
|
JUMP_INIT(pbackfail, (_IO_pbackfail_t) _IO_wstr_pbackfail),
|
|
JUMP_INIT(xsputn, _IO_wdefault_xsputn),
|
|
JUMP_INIT(xsgetn, _IO_wdefault_xsgetn),
|
|
JUMP_INIT(seekoff, _IO_wstr_seekoff),
|
|
JUMP_INIT(seekpos, _IO_default_seekpos),
|
|
JUMP_INIT(setbuf, (_IO_setbuf_t) _IO_wdefault_setbuf),
|
|
JUMP_INIT(sync, _IO_default_sync),
|
|
JUMP_INIT(doallocate, _IO_wdefault_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
|
|
_IO_vswprintf (string, maxlen, format, args)
|
|
wchar_t *string;
|
|
_IO_size_t maxlen;
|
|
const wchar_t *format;
|
|
_IO_va_list args;
|
|
{
|
|
_IO_strnfile sf;
|
|
int ret;
|
|
struct _IO_wide_data wd;
|
|
#ifdef _IO_MTSAFE_IO
|
|
_IO_lock_t lock;
|
|
sf.f._sbf._f._lock = &lock;
|
|
#endif
|
|
|
|
/* We need to handle the special case where MAXLEN is 0. Use the
|
|
overflow buffer right from the start. */
|
|
if (maxlen == 0)
|
|
{
|
|
string = sf.overflow_buf;
|
|
maxlen = sizeof (sf.overflow_buf) / sizeof (wchar_t);
|
|
}
|
|
|
|
_IO_no_init (&sf.f._sbf._f, 0, 0, &wd, &_IO_wstrn_jumps);
|
|
_IO_fwide (&sf.f._sbf._f, 1);
|
|
string[0] = L'\0';
|
|
_IO_wstr_init_static (&sf.f._sbf._f, string, maxlen - 1, string);
|
|
ret = _IO_vfwprintf ((_IO_FILE *) &sf.f._sbf, format, args);
|
|
|
|
if (sf.f._sbf._f._wide_data->_IO_buf_base != sf.overflow_buf)
|
|
*sf.f._sbf._f._wide_data->_IO_write_ptr = '\0';
|
|
return ret;
|
|
}
|
|
|
|
#ifdef weak_alias
|
|
weak_alias (_IO_vswprintf, __vswprintf)
|
|
weak_alias (_IO_vswprintf, vswprintf)
|
|
#endif
|