mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 10:22:41 +08:00
b259e74660
1998-08-23 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/i386/Versions [GLIBC_2.1]: Add __modify_ldt and modify_ldt. * sysdeps/unix/sysv/linux/i386/syscalls.list: Add modify_ldt. * sysdeps/unix/sysv/linux/i386/sysdep.h (SYSCALL_ERROR_HANDLER): Use orl $-1 instead of movl $-1 to save two bytes. * sysdeps/unix/sysv/linux/i386/i686/sysdep.h (SYSCALL_ERROR_HANDLER): Likewise. 1998-08-17 H.J. Lu <hjl@gnu.org> * libio/Versions (_IO_do_write, _IO_file_attach, _IO_file_close_it, _IO_file_finish, _IO_file_fopen, _IO_file_init, _IO_file_overflow, _IO_file_seekoff, _IO_file_setbuf, _IO_file_sync, _IO_file_underflow, _IO_file_write, _IO_file_xsputn): Added to GLIBC_2.1. * libio/fileops.c (_IO_do_write, _IO_file_attach, _IO_file_close_it, _IO_file_finish, _IO_file_fopen, _IO_file_init, _IO_file_overflow, _IO_file_seekoff, _IO_file_setbuf, _IO_file_sync, _IO_file_underflow, _IO_file_write, _IO_file_xsputn): Change the prefix to "_IO_new_". Added to GLIBC_2.1. * libio/libioP.h (_IO_do_write, _IO_file_attach, _IO_file_close_it, _IO_file_finish, _IO_file_fopen, _IO_file_init, _IO_file_overflow, _IO_file_seekoff, _IO_file_setbuf, _IO_file_sync, _IO_file_underflow, _IO_file_write, _IO_file_xsputn): Add prototypes for the prefix "_IO_new_". * libio/oldfileops.c (_IO_do_write, _IO_file_attach, _IO_file_close_it, _IO_file_finish, _IO_file_fopen, _IO_file_init, _IO_file_overflow, _IO_file_seekoff, _IO_file_setbuf, _IO_file_sync, _IO_file_underflow, _IO_file_write, _IO_file_xsputn): Added to GLIBC_2.0. 1998-08-23 Richard Henderson <rth@cygnus.com> * Makeconfig (LDFLAGS): Remove. * csu/initfini.c: Return to .text before __gmon_start__. * elf/elf.h (EM_FAKE_ALPHA): Rename from EM_OLD_ALPHA. (STO_MIPS_*): Rename from STO_*. (STB_MIPS_SPLIT_COMMON): Rename from STB_SPLIT_COMMON. (STO_ALPHA_NOPV, STO_ALPHA_STD_GPLOAD): New. * math/atest-exp.c (mpn_bitsize): Fix bit location calculation. (main): e3s is negative on zero. * math/atest-exp2.c: Likewise. * math/atest-sincos.c: Likewise. 1998-08-23 Andreas Jaeger <aj@arthur.rhein-neckar.de> * Makerules (install): Add comment about absolute paths. 1998-08-23 Ulrich Drepper <drepper@cygnus.com> * libio/vsnprintf.c (_IO_vsnprintf): Set first byte of destination array to NUL to handle maxlen==1 case correctly. Patch by HJ Lu. 1998-08-23 Richard Henderson <rth@cygnus.com>
140 lines
4.3 KiB
C
140 lines
4.3 KiB
C
/* Copyright (C) 1994, 1997 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. */
|
|
char overflow_buf[64];
|
|
} _IO_strnfile;
|
|
|
|
|
|
static int _IO_strn_overflow __P ((_IO_FILE *fp, int c));
|
|
|
|
static int
|
|
_IO_strn_overflow (fp, c)
|
|
_IO_FILE *fp;
|
|
int 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->_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->_IO_write_ptr = '\0';
|
|
|
|
_IO_setb (fp, snf->overflow_buf,
|
|
snf->overflow_buf + sizeof (snf->overflow_buf), 0);
|
|
|
|
fp->_IO_write_base = snf->overflow_buf;
|
|
fp->_IO_read_base = snf->overflow_buf;
|
|
fp->_IO_read_ptr = snf->overflow_buf;
|
|
fp->_IO_read_end = snf->overflow_buf + sizeof (snf->overflow_buf);
|
|
}
|
|
|
|
fp->_IO_write_ptr = snf->overflow_buf;
|
|
fp->_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_strn_jumps =
|
|
{
|
|
JUMP_INIT_DUMMY,
|
|
JUMP_INIT(finish, _IO_str_finish),
|
|
JUMP_INIT(overflow, _IO_strn_overflow),
|
|
JUMP_INIT(underflow, _IO_str_underflow),
|
|
JUMP_INIT(uflow, _IO_default_uflow),
|
|
JUMP_INIT(pbackfail, _IO_str_pbackfail),
|
|
JUMP_INIT(xsputn, _IO_default_xsputn),
|
|
JUMP_INIT(xsgetn, _IO_default_xsgetn),
|
|
JUMP_INIT(seekoff, _IO_str_seekoff),
|
|
JUMP_INIT(seekpos, _IO_default_seekpos),
|
|
JUMP_INIT(setbuf, _IO_default_setbuf),
|
|
JUMP_INIT(sync, _IO_default_sync),
|
|
JUMP_INIT(doallocate, _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
|
|
_IO_vsnprintf (string, maxlen, format, args)
|
|
char *string;
|
|
_IO_size_t maxlen;
|
|
const char *format;
|
|
_IO_va_list args;
|
|
{
|
|
_IO_strnfile sf;
|
|
int ret;
|
|
#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);
|
|
}
|
|
|
|
_IO_init ((_IO_FILE *) &sf, 0);
|
|
_IO_JUMPS ((_IO_FILE *) &sf) = &_IO_strn_jumps;
|
|
string[0] = '\0';
|
|
_IO_str_init_static ((_IO_FILE *) &sf, string, maxlen - 1, string);
|
|
ret = _IO_vfprintf ((_IO_FILE *) &sf, format, args);
|
|
|
|
if (sf.f._sbf._f._IO_buf_base != sf.overflow_buf)
|
|
*sf.f._sbf._f._IO_write_ptr = '\0';
|
|
return ret;
|
|
}
|
|
|
|
#ifdef weak_alias
|
|
weak_alias (_IO_vsnprintf, __vsnprintf)
|
|
weak_alias (_IO_vsnprintf, vsnprintf)
|
|
#endif
|