mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20:07 +00:00
77fe0b9cd8
2002-02-25 Ulrich Drepper <drepper@redhat.com> * assert/assert-perr.c: Use INTUSE to reference functions and variables inside libc itself. Ise INTDEF and INTDEF2 to define appropriate aliases. Add prototypes for the new aliases. * assert/assert.c: Likewise. * include/libc-symbols.h: Likewise. * include/stdio.h: Likewise. * include/netinet/in.h: Likewise. * include/rpc/auth.h: Likewise. * include/rpc/auth_unix.h: Likewise. * include/rpc/key_prot.h: Likewise. * include/rpc/pmap_prot.h: Likewise. * include/rpc/pmap_rmt.h: Likewise. * include/rpc/rpc_msg.h: Likewise. * include/rpc/xdr.h: Likewise. * inet/gethstbyad_r.c: Likewise. * inet/gethstbynm2_r.c: Likewise. * inet/gethstbynm_r.c: Likewise. * inet/gethstent_r.c: Likewise. * inet/in6_addr.c: Likewise. * libio/__fpurge.c: Likewise. * libio/filedoalloc.c: Likewise. * libio/fileops.c: Likewise. * libio/ftello.c: Likewise. * libio/ftello64.c: Likewise. * libio/genops.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofflush_u.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgetpos64.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofgets_u.c: Likewise. * libio/iofopen.c: Likewise. * libio/iofopncook.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofread_u.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/iofsetpos64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetline.c: Likewise. * libio/iogets.c: Likewise. * libio/iogetwline.c: Likewise. * libio/iolibio.h: Likewise. * libio/iopadn.c: Likewise. * libio/iopopen.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/ioungetwc.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/libioP.h: Likewise. * libio/memstream.c: Likewise. * libio/obprintf.c: Likewise. * libio/oldfileops.c: Likewise. * libio/oldiofclose.c: Likewise. * libio/oldiofdopen.c: Likewise. * libio/oldiofgetpos.c: Likewise. * libio/oldiofgetpos64.c: Likewise. * libio/oldiofopen.c: Likewise. * libio/oldiofsetpos.c: Likewise. * libio/oldiofsetpos64.c: Likewise. * libio/oldiopopen.c: Likewise. * libio/oldstdfiles.c: Likewise. * libio/putc.c: Likewise. * libio/setbuf.c: Likewise. * libio/setlinebuf.c: Likewise. * libio/stdfiles.c: Likewise. * libio/stdio.c: Likewise. * libio/strops.c: Likewise. * libio/vasprintf.c: Likewise. * libio/vscanf.c: Likewise. * libio/vsnprintf.c: Likewise. * libio/vswprintf.c: Likewise. * libio/wfiledoalloc.c: Likewise. * libio/wfileops.c: Likewise. * libio/wgenops.c: Likewise. * libio/wstrops.c: Likewise. * malloc/mtrace.c: Likewise. * misc/error.c: Likewise. * misc/syslog.c: Likewise. * nss/getXXbyYY_r.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/hosts-lookup.c: Likewise. * stdio-common/getw.c * stdio-common/printf-prs.c: Likewise. * stdio-common/printf_fp.c: Likewise. * stdio-common/printf_size.c: Likewise. * stdio-common/putw.c: Likewise. * stdio-common/scanf.c: Likewise. * stdio-common/sprintf.c: Likewise. * stdio-common/tmpfile64.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/strfmon.c: Likewise. * sunrpc/auth_des.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/authdes_prot.c: Likewise. * sunrpc/authuxprot.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_raw.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/clnt_unix.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/key_prot.c: Likewise. * sunrpc/openchild.c: Likewise. * sunrpc/pm_getmaps.c: Likewise. * sunrpc/pm_getport.c: Likewise. * sunrpc/pmap_clnt.c: Likewise. * sunrpc/pmap_prot.c: Likewise. * sunrpc/pmap_prot2.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rpc_cmsg.c: Likewise. * sunrpc/rpc_prot.c: Likewise. * sunrpc/svc_authux.c: Likewise. * sunrpc/svc_raw.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svc_unix.c: Likewise. * sunrpc/xdr.c: Likewise. * sunrpc/xdr_array.c: Likewise. * sunrpc/xdr_mem.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. * sysdeps/generic/_strerror.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * sysdeps/generic/tmpfile.c: Likewise. * sysdeps/gnu/errlist.awk: Likewise. * sysdeps/gnu/errlist.c: Likewise. * libio/Makefile (routines): Remove iosprint. * libio/iosprintf.c: Removed
195 lines
5.4 KiB
C
195 lines
5.4 KiB
C
/* Print output of stream to given obstack.
|
|
Copyright (C) 1996,1997,1999,2000,2001,2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
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. */
|
|
|
|
|
|
#ifdef __STDC__
|
|
#include <stdlib.h>
|
|
#endif
|
|
#include "libioP.h"
|
|
#include <assert.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <obstack.h>
|
|
#include <stdarg.h>
|
|
#include <stdio_ext.h>
|
|
|
|
|
|
struct _IO_obstack_file
|
|
{
|
|
struct _IO_FILE_plus file;
|
|
struct obstack *obstack;
|
|
};
|
|
|
|
|
|
static int
|
|
_IO_obstack_overflow (_IO_FILE *fp, int c)
|
|
{
|
|
struct obstack *obstack = ((struct _IO_obstack_file *) fp)->obstack;
|
|
int size;
|
|
|
|
/* Make room for another character. This might as well allocate a
|
|
new chunk a memory and moves the old contents over. */
|
|
assert (c != EOF);
|
|
obstack_1grow (obstack, c);
|
|
|
|
/* Setup the buffer pointers again. */
|
|
fp->_IO_write_base = obstack_base (obstack);
|
|
fp->_IO_write_ptr = obstack_next_free (obstack);
|
|
size = obstack_room (obstack);
|
|
fp->_IO_write_end = fp->_IO_write_ptr + size;
|
|
/* Now allocate the rest of the current chunk. */
|
|
obstack_blank_fast (obstack, size);
|
|
|
|
return c;
|
|
}
|
|
|
|
|
|
static _IO_size_t
|
|
_IO_obstack_xsputn (_IO_FILE *fp, const void *data, _IO_size_t n)
|
|
{
|
|
struct obstack *obstack = ((struct _IO_obstack_file *) fp)->obstack;
|
|
|
|
if (fp->_IO_write_ptr + n > fp->_IO_write_end)
|
|
{
|
|
int size;
|
|
|
|
/* We need some more memory. First shrink the buffer to the
|
|
space we really currently need. */
|
|
obstack_blank_fast (obstack, fp->_IO_write_ptr - fp->_IO_write_end);
|
|
|
|
/* Now grow for N bytes, and put the data there. */
|
|
obstack_grow (obstack, data, n);
|
|
|
|
/* Setup the buffer pointers again. */
|
|
fp->_IO_write_base = obstack_base (obstack);
|
|
fp->_IO_write_ptr = obstack_next_free (obstack);
|
|
size = obstack_room (obstack);
|
|
fp->_IO_write_end = fp->_IO_write_ptr + size;
|
|
/* Now allocate the rest of the current chunk. */
|
|
obstack_blank_fast (obstack, size);
|
|
}
|
|
else
|
|
fp->_IO_write_ptr = __mempcpy (fp->_IO_write_ptr, data, n);
|
|
|
|
return n;
|
|
}
|
|
|
|
|
|
/* the jump table. */
|
|
static struct _IO_jump_t _IO_obstack_jumps =
|
|
{
|
|
JUMP_INIT_DUMMY,
|
|
JUMP_INIT(finish, NULL),
|
|
JUMP_INIT(overflow, _IO_obstack_overflow),
|
|
JUMP_INIT(underflow, NULL),
|
|
JUMP_INIT(uflow, NULL),
|
|
JUMP_INIT(pbackfail, NULL),
|
|
JUMP_INIT(xsputn, _IO_obstack_xsputn),
|
|
JUMP_INIT(xsgetn, NULL),
|
|
JUMP_INIT(seekoff, NULL),
|
|
JUMP_INIT(seekpos, NULL),
|
|
JUMP_INIT(setbuf, NULL),
|
|
JUMP_INIT(sync, NULL),
|
|
JUMP_INIT(doallocate, NULL),
|
|
JUMP_INIT(read, NULL),
|
|
JUMP_INIT(write, NULL),
|
|
JUMP_INIT(seek, NULL),
|
|
JUMP_INIT(close, NULL),
|
|
JUMP_INIT(stat, NULL),
|
|
JUMP_INIT(showmanyc, NULL),
|
|
JUMP_INIT(imbue, NULL)
|
|
};
|
|
|
|
|
|
int
|
|
_IO_obstack_vprintf (struct obstack *obstack, const char *format, va_list args)
|
|
{
|
|
struct obstack_FILE
|
|
{
|
|
struct _IO_obstack_file ofile;
|
|
} new_f;
|
|
int result;
|
|
int size;
|
|
int room;
|
|
|
|
#ifdef _IO_MTSAFE_IO
|
|
new_f.ofile.file.file._lock = NULL;
|
|
#endif
|
|
|
|
_IO_no_init (&new_f.ofile.file.file, _IO_USER_LOCK, -1, NULL, NULL);
|
|
_IO_JUMPS (&new_f.ofile.file) = &_IO_obstack_jumps;
|
|
room = obstack_room (obstack);
|
|
size = obstack_object_size (obstack) + room;
|
|
if (size == 0)
|
|
{
|
|
/* We have to handle the allocation a bit different since the
|
|
`_IO_str_init_static' function would handle a size of zero
|
|
different from what we expect. */
|
|
|
|
/* Get more memory. */
|
|
obstack_make_room (obstack, 64);
|
|
|
|
/* Recompute how much room we have. */
|
|
room = obstack_room (obstack);
|
|
size = room;
|
|
|
|
assert (size != 0);
|
|
}
|
|
|
|
INTUSE(_IO_str_init_static) ((struct _IO_strfile_ *) &new_f.ofile,
|
|
obstack_base (obstack),
|
|
size, obstack_next_free (obstack));
|
|
/* Now allocate the rest of the current chunk. */
|
|
assert (size == (new_f.ofile.file.file._IO_write_end
|
|
- new_f.ofile.file.file._IO_write_base));
|
|
assert (new_f.ofile.file.file._IO_write_ptr
|
|
== (new_f.ofile.file.file._IO_write_base
|
|
+ obstack_object_size (obstack)));
|
|
obstack_blank_fast (obstack, room);
|
|
|
|
new_f.ofile.obstack = obstack;
|
|
|
|
result = INTUSE(_IO_vfprintf) (&new_f.ofile.file.file, format, args);
|
|
|
|
/* Shrink the buffer to the space we really currently need. */
|
|
obstack_blank_fast (obstack, (new_f.ofile.file.file._IO_write_ptr
|
|
- new_f.ofile.file.file._IO_write_end));
|
|
|
|
return result;
|
|
}
|
|
#ifdef weak_alias
|
|
weak_alias (_IO_obstack_vprintf, obstack_vprintf)
|
|
#endif
|
|
|
|
|
|
int
|
|
_IO_obstack_printf (struct obstack *obstack, const char *format, ...)
|
|
{
|
|
int result;
|
|
va_list ap;
|
|
va_start (ap, format);
|
|
result = _IO_obstack_vprintf (obstack, format, ap);
|
|
va_end (ap);
|
|
return result;
|
|
}
|
|
#ifdef weak_alias
|
|
weak_alias (_IO_obstack_printf, obstack_printf)
|
|
#endif
|