mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 00:31:08 +00:00
6dd67bd565
2002-08-24 Ulrich Drepper <drepper@redhat.com> * locale/programs/charmap.c (charmap_new_char): Don't use ULONG_MAX as maximum UCS4 value. * sysdeps/unix/sysv/linux/ia64/sys/user.h: New file. * sysdeps/generic/strtol.c: We don't need the isascii test in glibc. * malloc/hooks.c (public_sET_STATe): use size_t as type for i. * malloc/malloc.c (mALLINFo): Likewise. * libio/wstrops.c (_IO_wstr_pbackfail): Use WEOF in comparison. * libio/wfileops.c (_IO_wfile_overflow): Use EOF not WEOF when examining result of _IO_do_flush call. * stdio-common/vfprintf.c (vfprintf): Use correct type in va_arg. Use prec not spec when sizing buffers. * catgets/open_catalog.c (__open_catalog): Add casts to avoid warnings. * locale/loadarchive.c (_nl_load_locale_from_archive): Likewise. * locale/loadlocale.c (_nl_intern_locale_data): Likewise. * stdio-common/vfscanf.c (inchar): Likewise. * misc/efgcvt_r.c (fcvt_r): Likewise. * elf/dl-misc.c (_dl_debug_vdprintf): Likewise. * elf/readlib.c (process_file): Likewise. * elf/sprof.c (load_profdata): Likewise. * sysdeps/ia64/hp-timing.h (HP_TIMING_PRINT): Likewise. * locale/programs/linereader.c (get_toplvl_escape): Likewise. * locale/programs/charmap.c (charmap_read): Likewise. * libio/fileops.c: Likewise. * libio/fmemopen.c: Likewise. * stdlib/strtod.c: Likewise. * elf/dl-load.c: Likewise. * iconv/iconvconfig.c: Likewise. * iconv/iconv_prog.c (process_block): Likewise. * sysdeps/unix/sysv/linux/ia64/Makefile: Define _ASM_IA64_CURRENT_H macro to calm down the compiler. * iconv/gconv_cache.c (__gconv_load_cache): Add cast to avoid warning. * sysdeps/ia64/elf/initfini.c: Don't use newlines embedded in string. * sysdeps/unix/sysv/linux/i386/sysdep.S: Update comment regarding placement of errno definition. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/mips/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S: Likewise. * resolv/nss_dns/dns-host.c (MAXPACKET): Increase minimum value from 1024 to 65536, to avoid buffer overrun. 2002-08-16 Paul Eggert <eggert@twinsun.com> * resolv/gethnamaddr.c (MAXPACKET): Increase minimum value from 1024 to 65536, to avoid buffer overrun. * resolv/res_query.c (MAXPACKET): Likewise. architectures.
334 lines
10 KiB
C
334 lines
10 KiB
C
/* Copyright (C) 1993,1997,1998,1999,2001,2002 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.
|
|
|
|
As a special exception, if you link the code in this file with
|
|
files compiled with a GNU compiler to produce an executable,
|
|
that does not cause the resulting executable to be covered by
|
|
the GNU Lesser General Public License. This exception does not
|
|
however invalidate any other reasons why the executable file
|
|
might be covered by the GNU Lesser General Public License.
|
|
This exception applies to code released by its copyright holders
|
|
in files containing the exception. */
|
|
|
|
#include "strfile.h"
|
|
#include "libioP.h"
|
|
#include <string.h>
|
|
#include <wchar.h>
|
|
#include <stdio_ext.h>
|
|
|
|
#if 0
|
|
/* The following definitions are for exposition only.
|
|
They map the terminology used in the ANSI/ISO C++ draft standard
|
|
to the implementation. */
|
|
|
|
/* allocated: set when a dynamic array object has been allocated, and
|
|
hence should be freed by the destructor for the strstreambuf object. */
|
|
#define ALLOCATED(FP) ((FP)->_f._IO_buf_base && DYNAMIC(FP))
|
|
|
|
/* constant: set when the array object has const elements,
|
|
so the output sequence cannot be written. */
|
|
#define CONSTANT(FP) ((FP)->_f._IO_file_flags & _IO_NO_WRITES)
|
|
|
|
/* alsize: the suggested minimum size for a dynamic array object. */
|
|
#define ALSIZE(FP) ??? /* not stored */
|
|
|
|
/* palloc: points to the function to call to allocate a dynamic array object.*/
|
|
#define PALLOC(FP) \
|
|
((FP)->_s._allocate_buffer == default_alloc ? 0 : (FP)->_s._allocate_buffer)
|
|
|
|
/* pfree: points to the function to call to free a dynamic array object. */
|
|
#define PFREE(FP) \
|
|
((FP)->_s._free_buffer == default_free ? 0 : (FP)->_s._free_buffer)
|
|
|
|
#endif
|
|
|
|
#ifdef TODO
|
|
/* An "unbounded buffer" is when a buffer is supplied, but with no
|
|
specified length. An example is the buffer argument to sprintf.
|
|
*/
|
|
#endif
|
|
|
|
void
|
|
_IO_wstr_init_static (fp, ptr, size, pstart)
|
|
_IO_FILE *fp;
|
|
wchar_t *ptr;
|
|
int size;
|
|
wchar_t *pstart;
|
|
{
|
|
if (size == 0)
|
|
size = __wcslen (ptr);
|
|
else if (size < 0)
|
|
{
|
|
/* If size is negative 'the characters are assumed to
|
|
continue indefinitely.' This is kind of messy ... */
|
|
int s;
|
|
size = 512;
|
|
/* Try increasing powers of 2, as long as we don't wrap around. */
|
|
for (; s = 2*size, s > 0 && ptr + s > ptr && s < 0x4000000L; )
|
|
size = s;
|
|
/* Try increasing size as much as we can without wrapping around. */
|
|
for (s = size >> 1; s > 0; s >>= 1)
|
|
{
|
|
if (ptr + size + s > ptr)
|
|
size += s;
|
|
}
|
|
}
|
|
INTUSE(_IO_wsetb) (fp, ptr, ptr + size, 0);
|
|
|
|
fp->_wide_data->_IO_write_base = ptr;
|
|
fp->_wide_data->_IO_read_base = ptr;
|
|
fp->_wide_data->_IO_read_ptr = ptr;
|
|
if (pstart)
|
|
{
|
|
fp->_wide_data->_IO_write_ptr = pstart;
|
|
fp->_wide_data->_IO_write_end = ptr + size;
|
|
fp->_wide_data->_IO_read_end = pstart;
|
|
}
|
|
else
|
|
{
|
|
fp->_wide_data->_IO_write_ptr = ptr;
|
|
fp->_wide_data->_IO_write_end = ptr;
|
|
fp->_wide_data->_IO_read_end = ptr + size;
|
|
}
|
|
/* A null _allocate_buffer function flags the strfile as being static. */
|
|
(((_IO_strfile *) fp)->_s._allocate_buffer) = (_IO_alloc_type)0;
|
|
}
|
|
|
|
void
|
|
_IO_wstr_init_readonly (fp, ptr, size)
|
|
_IO_FILE *fp;
|
|
const char *ptr;
|
|
int size;
|
|
{
|
|
_IO_wstr_init_static (fp, (wchar_t *) ptr, size, NULL);
|
|
fp->_IO_file_flags |= _IO_NO_WRITES;
|
|
}
|
|
|
|
_IO_wint_t
|
|
_IO_wstr_overflow (fp, c)
|
|
_IO_FILE *fp;
|
|
_IO_wint_t c;
|
|
{
|
|
int flush_only = c == WEOF;
|
|
_IO_size_t pos;
|
|
if (fp->_flags & _IO_NO_WRITES)
|
|
return flush_only ? 0 : WEOF;
|
|
if ((fp->_flags & _IO_TIED_PUT_GET) && !(fp->_flags & _IO_CURRENTLY_PUTTING))
|
|
{
|
|
fp->_flags |= _IO_CURRENTLY_PUTTING;
|
|
fp->_wide_data->_IO_write_ptr = fp->_wide_data->_IO_read_ptr;
|
|
fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_end;
|
|
}
|
|
pos = fp->_wide_data->_IO_write_ptr - fp->_wide_data->_IO_write_base;
|
|
if (pos >= (_IO_size_t) (_IO_wblen (fp) + flush_only))
|
|
{
|
|
if (fp->_flags & _IO_USER_BUF) /* not allowed to enlarge */
|
|
return WEOF;
|
|
else
|
|
{
|
|
wchar_t *new_buf;
|
|
wchar_t *old_buf = fp->_wide_data->_IO_buf_base;
|
|
_IO_size_t new_size = 2 * _IO_wblen (fp) + 100;
|
|
new_buf
|
|
= (wchar_t *) (*((_IO_strfile *) fp)->_s._allocate_buffer) (new_size
|
|
* sizeof (wchar_t));
|
|
if (new_buf == NULL)
|
|
{
|
|
/* __ferror(fp) = 1; */
|
|
return WEOF;
|
|
}
|
|
if (old_buf)
|
|
{
|
|
__wmemcpy (new_buf, old_buf, _IO_wblen (fp));
|
|
(*((_IO_strfile *) fp)->_s._free_buffer) (old_buf);
|
|
/* Make sure _IO_setb won't try to delete _IO_buf_base. */
|
|
fp->_wide_data->_IO_buf_base = NULL;
|
|
}
|
|
INTUSE(_IO_wsetb) (fp, new_buf, new_buf + new_size, 1);
|
|
fp->_wide_data->_IO_read_base =
|
|
new_buf + (fp->_wide_data->_IO_read_base - old_buf);
|
|
fp->_wide_data->_IO_read_ptr =
|
|
new_buf + (fp->_wide_data->_IO_read_ptr - old_buf);
|
|
fp->_wide_data->_IO_read_end =
|
|
new_buf + (fp->_wide_data->_IO_read_end - old_buf);
|
|
fp->_wide_data->_IO_write_ptr =
|
|
new_buf + (fp->_wide_data->_IO_write_ptr - old_buf);
|
|
|
|
fp->_wide_data->_IO_write_base = new_buf;
|
|
fp->_wide_data->_IO_write_end = fp->_wide_data->_IO_buf_end;
|
|
}
|
|
}
|
|
|
|
if (!flush_only)
|
|
*fp->_wide_data->_IO_write_ptr++ = c;
|
|
if (fp->_wide_data->_IO_write_ptr > fp->_wide_data->_IO_read_end)
|
|
fp->_wide_data->_IO_read_end = fp->_wide_data->_IO_write_ptr;
|
|
return c;
|
|
}
|
|
|
|
_IO_wint_t
|
|
_IO_wstr_underflow (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
if (fp->_wide_data->_IO_write_ptr > fp->_wide_data->_IO_read_end)
|
|
fp->_wide_data->_IO_read_end = fp->_wide_data->_IO_write_ptr;
|
|
if ((fp->_flags & _IO_TIED_PUT_GET) && (fp->_flags & _IO_CURRENTLY_PUTTING))
|
|
{
|
|
fp->_flags &= ~_IO_CURRENTLY_PUTTING;
|
|
fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_write_ptr;
|
|
fp->_wide_data->_IO_write_ptr = fp->_wide_data->_IO_write_end;
|
|
}
|
|
if (fp->_wide_data->_IO_read_ptr < fp->_wide_data->_IO_read_end)
|
|
return *fp->_wide_data->_IO_read_ptr;
|
|
else
|
|
return WEOF;
|
|
}
|
|
|
|
/* The size of the valid part of the buffer. */
|
|
|
|
_IO_ssize_t
|
|
_IO_wstr_count (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
return ((fp->_wide_data->_IO_write_ptr > fp->_wide_data->_IO_read_end
|
|
? fp->_wide_data->_IO_write_ptr : fp->_wide_data->_IO_read_end)
|
|
- fp->_wide_data->_IO_read_base);
|
|
}
|
|
|
|
_IO_off64_t
|
|
_IO_wstr_seekoff (fp, offset, dir, mode)
|
|
_IO_FILE *fp;
|
|
_IO_off64_t offset;
|
|
int dir;
|
|
int mode;
|
|
{
|
|
_IO_off64_t new_pos;
|
|
|
|
if (mode == 0 && (fp->_flags & _IO_TIED_PUT_GET))
|
|
mode = (fp->_flags & _IO_CURRENTLY_PUTTING ? _IOS_OUTPUT : _IOS_INPUT);
|
|
|
|
if (mode == 0)
|
|
{
|
|
/* Don't move any pointers. But there is no clear indication what
|
|
mode FP is in. Let's guess. */
|
|
if (fp->_IO_file_flags & _IO_NO_WRITES)
|
|
new_pos = fp->_wide_data->_IO_read_ptr - fp->_wide_data->_IO_read_base;
|
|
else
|
|
new_pos = (fp->_wide_data->_IO_write_ptr
|
|
- fp->_wide_data->_IO_write_base);
|
|
}
|
|
else
|
|
{
|
|
_IO_ssize_t cur_size = _IO_wstr_count (fp);
|
|
new_pos = EOF;
|
|
|
|
/* Move the get pointer, if requested. */
|
|
if (mode & _IOS_INPUT)
|
|
{
|
|
switch (dir)
|
|
{
|
|
case _IO_seek_end:
|
|
offset += cur_size;
|
|
break;
|
|
case _IO_seek_cur:
|
|
offset += (fp->_wide_data->_IO_read_ptr
|
|
- fp->_wide_data->_IO_read_base);
|
|
break;
|
|
default: /* case _IO_seek_set: */
|
|
break;
|
|
}
|
|
if (offset < 0 || (_IO_ssize_t) offset > cur_size)
|
|
return EOF;
|
|
fp->_wide_data->_IO_read_ptr = (fp->_wide_data->_IO_read_base
|
|
+ offset);
|
|
fp->_wide_data->_IO_read_end = (fp->_wide_data->_IO_read_base
|
|
+ cur_size);
|
|
new_pos = offset;
|
|
}
|
|
|
|
/* Move the put pointer, if requested. */
|
|
if (mode & _IOS_OUTPUT)
|
|
{
|
|
switch (dir)
|
|
{
|
|
case _IO_seek_end:
|
|
offset += cur_size;
|
|
break;
|
|
case _IO_seek_cur:
|
|
offset += (fp->_wide_data->_IO_write_ptr
|
|
- fp->_wide_data->_IO_write_base);
|
|
break;
|
|
default: /* case _IO_seek_set: */
|
|
break;
|
|
}
|
|
if (offset < 0 || (_IO_ssize_t) offset > cur_size)
|
|
return EOF;
|
|
fp->_wide_data->_IO_write_ptr = (fp->_wide_data->_IO_write_base
|
|
+ offset);
|
|
new_pos = offset;
|
|
}
|
|
}
|
|
return new_pos;
|
|
}
|
|
|
|
_IO_wint_t
|
|
_IO_wstr_pbackfail (fp, c)
|
|
_IO_FILE *fp;
|
|
_IO_wint_t c;
|
|
{
|
|
if ((fp->_flags & _IO_NO_WRITES) && c != WEOF)
|
|
return WEOF;
|
|
return INTUSE(_IO_wdefault_pbackfail) (fp, c);
|
|
}
|
|
|
|
void
|
|
_IO_wstr_finish (fp, dummy)
|
|
_IO_FILE *fp;
|
|
int dummy;
|
|
{
|
|
if (fp->_wide_data->_IO_buf_base && !(fp->_flags & _IO_USER_BUF))
|
|
(((_IO_strfile *) fp)->_s._free_buffer) (fp->_wide_data->_IO_buf_base);
|
|
fp->_wide_data->_IO_buf_base = NULL;
|
|
|
|
INTUSE(_IO_wdefault_finish) (fp, 0);
|
|
}
|
|
|
|
struct _IO_jump_t _IO_wstr_jumps =
|
|
{
|
|
JUMP_INIT_DUMMY,
|
|
JUMP_INIT(finish, _IO_wstr_finish),
|
|
JUMP_INIT(overflow, (_IO_overflow_t) _IO_wstr_overflow),
|
|
JUMP_INIT(underflow, (_IO_underflow_t) _IO_wstr_underflow),
|
|
JUMP_INIT(uflow, (_IO_underflow_t) INTUSE(_IO_wdefault_uflow)),
|
|
JUMP_INIT(pbackfail, (_IO_pbackfail_t) _IO_wstr_pbackfail),
|
|
JUMP_INIT(xsputn, INTUSE(_IO_wdefault_xsputn)),
|
|
JUMP_INIT(xsgetn, INTUSE(_IO_wdefault_xsgetn)),
|
|
JUMP_INIT(seekoff, _IO_wstr_seekoff),
|
|
JUMP_INIT(seekpos, _IO_default_seekpos),
|
|
JUMP_INIT(setbuf, _IO_default_setbuf),
|
|
JUMP_INIT(sync, _IO_default_sync),
|
|
JUMP_INIT(doallocate, INTUSE(_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)
|
|
};
|