mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 19:00:07 +00:00
d64b6ad075
* Versions.def: Add GLIBC_2.2 for libc. * iconv/gconv.h: Make header suitable for inclusion in public header by protecting all names with __. * iconv/gconv.c: Adapt for symbol name changes. * iconv/gconv.h: Likewise. * iconv/gconv_builtin.c: Likewise. * iconv/gconv_close.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_open.c: Likewise. * iconv/gconv_simple.c: Likewise. * iconv/iconv.c: Likewise. * iconv/iconv_close.c: Likewise. * iconv/iconv_open.c: Likewise. * iconv/loop.c: Likewise. * iconv/skeleton.c: Likewise. * iconvdata/8bit-gap.c: Likewise. * iconvdata/8bit-generic.c: Likewise. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/cns11643.h: Likewise. * iconvdata/cns11643l1.h: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/euc-tw.c: Likewise. * iconvdata/gb2312.h: Likewise. * iconvdata/iso-2022-jp.c: Likewise. * iconvdata/iso-2022-kr.c: Likewise. * iconvdata/iso646.c: Likewise. * iconvdata/iso8859-1.c: Likewise. * iconvdata/iso_6937-2.c: Likewise. * iconvdata/iso_6937.c: Likewise. * iconvdata/jis0201.h: Likewise. * iconvdata/jis0208.h: Likewise. * iconvdata/jis0212.h: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/ksc5601.h: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t.61.c: Likewise. * iconvdata/uhc.c: Likewise. * stdlib/mblen.c: Likewise. * stdlib/mbtowc.c: Likewise. * stdlib/wctomb.c: Likewise. * wcsmbs/btowc.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wchar.h: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * wcsmbs/wcsmbsload.h: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * include/limits.h (MB_LEN_MAX): Increase to 16. * sysdeps/generic/_G_config.h: Define _G_fpos_t as struct. Define _G_iconv_t. * sysdeps/unix/sysv/linux/_G_config.h: Likewise. * include/wchar.h: Change mbstate_t to __mbstate_t. * libio/Makefile (routines): Add wfiledoalloc, oldiofgetpos, oldiofgetpos64, oldiofsetpos, oldiofsetpos64, fputwc, fputwc_u, getwc, getwc_u, getwchar, getwchar_u, iofgetws, iofgetws_u, iofputws, iofputws_u, iogetwline, iowpadn, ioungetwc, putwc, putwc_u, putchar, putchar_u, swprintf, vwprintf, wprintf, wscanf, fwscanf, vwscanf, vswprintf, iovswscanf, swscanf, wgenops, wstrops, wfileops, and iofwide. (tests): Add tst_swprintf, tst_wprintf, tst_swscanf, and tst_wscanf. * libio/Versions: Add _IO_fgetpos, _IO_fgetpos64, _IO_fsetpos, _IO_fsetpos64, fgetpos, fgetpos64, fgetwc, fgetwc_unlocked, fgetws, fgetws_unlocked, fputwc, fputwc_unlocked, fputws, fputws_unlocked, fsetpos, fsetpos64, fwide, fwprintf, fwscanf, getwc, getwc_unlocked, getwchar, getwchar_unlocked, putwc, putwc_unlocked, putwchar, putwchar_unlocked, swprintf, swscanf, ungetwc, vfwprintf, vswprintf, vwprintf, vfwscanf, vswscanf, vwscanf, wprintf, and wscanf to GLIBC_2.2 for libc. * libio/libio.h: Define codecvt struct. Define _IO_wide_data. Extend _IO_file contain pointer to codecvt, widedata and mode. (_IO_getwc_unlocked): New macro. (_IO_putwc_unlocked): New macro. (_IO_fwide): New macro. * libio/libioP.h: Add new prototypes and adjust existing declarations. * libio/fileops.c (_IO_new_file_close_it): Reset normal or widedata buffers based on mode. (new_do_write): Set _IO_write_end to _IO_buf_end if stream is wide oriented. (_IO_new_file_overflow): Don't depend only on _IO_CURRENTLY_PUTTING flag to be enough to signal unallocated buffer. For wide oriented stream don't make it linebuffered. Don't use _IO_do_flush, use _IO_new_do_write directly. (_IO_new_file_seekoff): Change return value type to _IO_off64_t. (_IO_file_seek): Likewise. * libio/genops.c (_IO_least_marker): Make global. (__underflow): Orient stream if not already done. (__uflow): Likewise. (_IO_default_seekpos): Change to type _IO_off64_t. (_IO_default_seekoff): Likewise. (_IO_default_seek): Likewise. (_IO_no_init): New function. Similar to _IO_init but allows to orient in initialization. * libio/iolibio.h: Add prototype for _IO_vswprintf. Change _IO_pos_BAD to use _IO_off64_t. * libio/ftello.c: Use _IO_off_t. For now abort when use with wide char stream. * libio/ftello64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofopncook.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/oldfileops.c: Likewise. * libio/iofgetpos.c: Store state of conversion if necessary. * libio/iofgetpos64.c: Likewise. * libio/iofsetpos.c: Restore conversion state if necessary. * libio/iofsetpos64.c: Likewise. * libio/iofdopen.c: Initialize so that stream can be wide oriented. * libio/iofopen.c: Likewise. * libio/iofopen64.c: Likewise. * libio/iopopen.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/memstream.c: Likewise. * libio/obprintf.c: Likewise. * libio/iofputs.c: Orient stream if not already happened. * libio/iofputs_u.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iofwrite_u.c: Likewise. * libio/ioputs.c: Likewise. * libio/iosetbuffer.c: Handle not yet oriented stream. * libio/iosetvbuf.c: Likewise. * libio/oldstdfiles.c: Adjust FILEBUF_LITERAL call. * libio/stdfiles.c: Likewise. * libio/strops.c (_IO_str_overflow): Correctly free buffer after failed allocation. (_IO_str_seekoff): Use _IO_off64_t. * libio/vasprintf.c: Pre-orient stream. * libio/vsnprintf.c: Likewise. * libio/fputwc.c: New file. * libio/fputwc_u.c: New file. * libio/fwprintf.c: New file. * libio/fwscanf.c: New file. * libio/getwc.c: New file. * libio/getwc_u.c: New file. * libio/getwchar.c: New file. * libio/getwchar_u.c: New file. * libio/iofgetws.c: New file. * libio/iofgetws_u.c: New file. * libio/iofputws.c: New file. * libio/iofputws_u.c: New file. * libio/iofwide.c: New file. * libio/iogetwline.c: New file. * libio/ioungetwc.c: New file. * libio/iovswscanf.c: New file. * libio/iowpadn.c: New file. * libio/oldiofgetpos.c: New file. * libio/oldiofgetpos64.c: New file. * libio/oldiofsetpos.c: New file. * libio/oldiofsetpos64.c: New file. * libio/putwc.c: New file. * libio/putwc_u.c: New file. * libio/putwchar.c: New file. * libio/putwchar_u.c: New file. * libio/swprintf.c: New file. * libio/swscanf.c: New file. * libio/tst_swprintf.c: New file. * libio/tst_swscanf.c: New file. * libio/tst_wprintf.c: New file. * libio/tst_wscanf.c: New file. * libio/tst_wscanf.input: New file. * libio/vswprintf.c: New file. * libio/vwprintf.c: New file. * libio/vwscanf.c: New file. * libio/wfiledoalloc.c: New file. * libio/wfileops.c: New file. * libio/wgenops.c: New file. * libio/wprintf.c: New file. * libio/wscanf.c: New file. * libio/wstrops.c: New file. * stdio-common/Makefile (routines): Add _itowa, itowa-digits, vfwprintf, and vfwscanf. * stdio-common/_itoa.c (base_table): Rename to _IO_base_table and make global. * stdio-common/_itowa.c: New file. * stdio-common/_itowa.h: New file. * stdio-common/itoa-digits.c: Minimal optimization. * stdio-common/itowa-digits.c: New file. * stdio-common/printf-parse.h: Allow use in wide character context. * stdio-common/printf-prs.c: Define ISASCII and MBRLEN. * stdio-common/printf.h (printf_info): Add wide bit. * stdio-common/printf_fp.c: Determine from wide bit whether stream is wide oriented or not. * stdio-common/printf_size.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * stdlib/strfmon.c: Call __printf_fp with wide bit cleared. * stdio-common/vfprintf.c: Rewrite to allow use in wide character context. * stdio-common/vfscand.c: Likewise. * stdio-common/vfwprintf.c: New file. * stdio-common/vfwscanf.c: New file. * time/Makefile (routines): Add wcsftime. (tests): Add tst_wcsftime. * time/Versions: Add wcsftime to GLIBC_2.2 for libc. * time/strftime.c: Make usable as wcsftime. * time/wcsftime.c: New file. * time/tst_wcsftime.c: New file. * wcsmbs/Makefile (routines): Add wmempcpy and wcschrnul. * wcsmbs/Versions: Add wmempcpy and wcschrnul to GLIBC_2.2 for libc. * wcsmbs/wcschrnul.c: New file. * wcsmbs/wmemcpy.c: New file. * wcsmbs/wmemcpy.c: Rename to __wmemcpy and make wmemcpy weak alias. * wcsmbs/wmemmove.c: Likewise for wmemmove. * manual/stdio.texi: Document is_char and wide element if printf_info. * manual/time.texi: Document wcsftime. * include/wchar.h: Add prototypes for __wmemcpy, __wmempcpy, __wmemmove, __wcschrnul, and __vfwscanf. * locale/langinfo.h: Add new LC_TIME entries for wchar_t data. * locale/C-time.c: Adapt for above change. * locale/categories.def: Likewise. * locale/localeinfo.h: Likewise. * localedata/Makefile: Don't run tests for now.
167 lines
4.8 KiB
C
167 lines
4.8 KiB
C
/* Print output of stream to given obstack.
|
|
Copyright (C) 1996, 1997, 1999 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 Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. 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 <string.h>
|
|
#include <errno.h>
|
|
#include <obstack.h>
|
|
#include <stdarg.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;
|
|
|
|
/* Make room for another character. This might as well allocate a
|
|
new chunk a memory and moves the old contents over. */
|
|
if (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);
|
|
fp->_IO_write_end = fp->_IO_write_ptr + obstack_room (obstack);
|
|
/* Now allocate the rest of the current chunk. */
|
|
obstack_blank_fast (obstack, fp->_IO_write_end - fp->_IO_write_ptr);
|
|
|
|
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)
|
|
{
|
|
/* 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);
|
|
fp->_IO_write_end = (fp->_IO_write_ptr + obstack_room (obstack));
|
|
/* Now allocate the rest of the current chunk. */
|
|
obstack_blank_fast (obstack, fp->_IO_write_end - fp->_IO_write_ptr);
|
|
}
|
|
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;
|
|
#ifdef _IO_MTSAFE_IO
|
|
_IO_lock_t lock;
|
|
#endif
|
|
} new_f;
|
|
int result;
|
|
|
|
#ifdef _IO_MTSAFE_IO
|
|
new_f.ofile.file.file._lock = &new_f.lock;
|
|
#endif
|
|
|
|
_IO_no_init (&new_f.ofile.file.file, 0, -1, NULL, NULL);
|
|
_IO_JUMPS (&new_f.ofile.file) = &_IO_obstack_jumps;
|
|
_IO_str_init_static (&new_f.ofile.file.file, obstack_base (obstack),
|
|
(obstack_object_size (obstack) +
|
|
obstack_room (obstack)), obstack_next_free (obstack));
|
|
/* Now allocate the rest of the current chunk. */
|
|
obstack_blank_fast (obstack,
|
|
(new_f.ofile.file.file._IO_write_end
|
|
- new_f.ofile.file.file._IO_write_ptr));
|
|
new_f.ofile.obstack = obstack;
|
|
|
|
result = _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
|