mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
40a55d2054
1997-08-20 05:30 Ulrich Drepper <drepper@cygnus.com> * catgets/catgets.c (catclose): Use __munmap instead of munmap. * catgets/gencat.c (read_input_file): Fix typo. * dirent/dirent.h: Make seekdir and telldir available for __USE_XOPEN. * elf/dl-load.c: Fix case of missing DT_RPATH in object which gets executed (e.g., when it is a static binary). * intl/bindtextdomain.c: Use strdup in glibc. Correct comment. * intl/dcgettext.c: Likewise. * intl/dgettext.c: Likewise. * intl/explodename.c: Likewise. * intl/finddomain.c: Likewise. * intl/gettext.c: Likewise. * intl/gettext.h: Likewise. * intl/hash-string.h: Likewise. * intl/l10nflist.c: Likewise. * intl/libintl.h: Likewise. * intl/loadinfo.h: Likewise. * intl/loadmsgcat.c: Likewise. * intl/localealias.c: Likewise. * intl/textdomain.c: Likewise. Unify libio sources with code in libg++. * libio/fcloseall.c: Update and reformat copyright. Protect use of weak_alias. Use _IO_* thread macros instead of __libc_*. * libio/feof.c: Likewise. * libio/feof_u.c: Likewise. * libio/ferror.c: Likewise. * libio/ferror_u.c: Likewise. * libio/fgetc.c: Likewise. * libio/filedoalloc.c: Likewise. * libio/fileno.c: Likewise. * libio/fileops.c: Likewise. * libio/fputc.c: Likewise. * libio/fputc_u.c: Likewise. * libio/freopen.c: Likewise. * libio/fseek.c: Likewise. * libio/genops.c: Likewise. * libio/getc.c: Likewise. * libio/getc_u.c: Likewise. * libio/getchar.c: Likewise. * libio/getchar_u.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofflush_u.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofopen.c: Likewise. * libio/iofopncook.c: Likewise. * libio/iofprintf.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetdelim.c: Likewise. * libio/iogetline.c: Likewise. * libio/iogets.c: Likewise. * libio/iopadn.c: Likewise. * libio/iopopen.c: Likewise. * libio/ioputs.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/iosprintf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/libio.h: Likewise. * libio/libioP.h: Likewise. * libio/obprintf.c: Likewise. * libio/pclose.c: Likewise. * libio/peekc.c: Likewise. * libio/putc.c: Likewise. * libio/putchar.c: Likewise. * libio/rewind.c: Likewise. * libio/setbuf.c: Likewise. * libio/setlinebuf.c: Likewise. * libio/stdfiles.c: Likewise. * libio/stdio.c: Likewise. * libio/strfile.h: Likewise. * libio/strops.c: Likewise. * libio/vasprintf.c: Likewise. * libio/vscanf.c: Likewise. * libio/vsnprintf.c: Likewise. * manual/libc.texinfo: Add menu entries for chapter on message translation. * manual/locale.texi: Correct next entry in @node for new chapter. * manual/search.texi: Likewise for previous link. * manual/message.texi: New file. * manual/startup.texi: Document LC_ALL, LC_MESSAGES, NLSPATH, setenv, unsetenv, and clearenv. * manual/string.texi: Fix typos. Patch by Jim Meyering. * math/Makefile (test-longdouble-yes): Enable. We want long double tests now. Crusade against strcat. * nis/nss_nisplus/nisplus-publickey.c: Remove uses of strcat. * stdlib/canonicalize.c: Likewise. * posix/glob.h: Define __const if necessary. Use __const in all prototypes. * sysdeps/generic/stpcpy.c: Use K&R form to allow use in other GNU packages. * posix/wordexp.c: Completely reworked buffer handling for much better performance. Patch by Tim Waugh. * socket/sys/sochet.h (getpeername): Fix type of LEN parameter, it must be socklen_t. * sysdeps/libm-i387/e_remainder.S: Pretty print. * sysdeps/libm-i387/e_remainderf.S: Likewise. * sysdeps/libm-i387/e_remainderl.S: Pop extra value for FPU stack. * sysdeps/libm-i387/s_cexp.S: Little optimization. * sysdeps/libm-i387/s_cexpl.S: Likewise. * sysdep/libm-ieee754/s_csinhl.c: Include <fenv.h>. 1997-08-18 15:21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/if_index.c (if_nameindex): Fix memory leak in cleanup code. 1997-08-17 Paul Eggert <eggert@twinsun.com> * tzset.c (__tzset_internal): Fix memory leak when the user specifies a TZ value that uses a default rule file. Do not assume US DST rules when the user specifies that there is no DST. 1997-08-10 19:17 Philip Blundell <Philip.Blundell@pobox.com> * inet/getnameinfo.c: Tidy up. * sysdeps/posix/getaddrinfo.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c (if_nametoindex): Return 0 if using stub code. (if_indextoname): Use SIOGIFNAME ioctl if the kernel supports it. (if_nameindex): Use alloca() rather than malloc(); use SIOCGIFCOUNT ioctl if the kernel supports it. 1997-08-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/sys/mount.h: Remove the IS_* macros, they operate on internal kernel structures and have no place in a user header. 1997-08-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules (lib%.so): Depend on $(+preinit) and $(+postinit). (build-shlib): Filter them out of $^. 1997-08-15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/dl-error.c (_dl_signal_error): Fix error message. 1997-08-16 04:06 Ulrich Drepper <drepper@cygnus.com> * assert/assert.h [__USE_GNU]: Undefine assert_perror. Reported by Theodore C. Belding <Ted.Belding@umich.edu>. 1997-08-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makeconfig: Change object suffixes from *.[spgb]o to *.o[spgb] to avoid conflict with PO files. * Makerules: Likewise. * Rules: Likewise. * elf/Makefile: Likewise. * extra-lib.mk: Likewise. * gmon/Makefile: Likewise. * nis/Makefile: Likewise. * nss/Makefile: Likewise. * resolv/Makefile: Likewise. * rpm/Makefile: Likewise. * sunrpc/Makefile: Likewise. * sysdeps/sparc/elf/Makefile: Likewise. * sysdeps/sparc64/elf/Makefile: Likewise. * sysdeps/unix/sysv/linux/sparc/Makefile: Likewise. (ASFLAGS-.os): Renamed from as-FLAGS.os.
304 lines
8.4 KiB
C
304 lines
8.4 KiB
C
/* Copyright (C) 1993, 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 "strfile.h"
|
|
#include "libioP.h"
|
|
#include <string.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_str_init_static (fp, ptr, size, pstart)
|
|
_IO_FILE *fp;
|
|
char *ptr;
|
|
int size;
|
|
char *pstart;
|
|
{
|
|
if (size == 0)
|
|
size = strlen (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;
|
|
}
|
|
}
|
|
_IO_setb (fp, ptr, ptr + size, 0);
|
|
|
|
fp->_IO_write_base = ptr;
|
|
fp->_IO_read_base = ptr;
|
|
fp->_IO_read_ptr = ptr;
|
|
if (pstart)
|
|
{
|
|
fp->_IO_write_ptr = pstart;
|
|
fp->_IO_write_end = ptr + size;
|
|
fp->_IO_read_end = pstart;
|
|
}
|
|
else
|
|
{
|
|
fp->_IO_write_ptr = ptr;
|
|
fp->_IO_write_end = ptr;
|
|
fp->_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_str_init_readonly (fp, ptr, size)
|
|
_IO_FILE *fp;
|
|
const char *ptr;
|
|
int size;
|
|
{
|
|
_IO_str_init_static (fp, (char *) ptr, size, NULL);
|
|
fp->_IO_file_flags |= _IO_NO_WRITES;
|
|
}
|
|
|
|
int
|
|
_IO_str_overflow (fp, c)
|
|
_IO_FILE *fp;
|
|
int c;
|
|
{
|
|
int flush_only = c == EOF;
|
|
_IO_size_t pos;
|
|
if (fp->_flags & _IO_NO_WRITES)
|
|
return flush_only ? 0 : EOF;
|
|
if ((fp->_flags & _IO_TIED_PUT_GET) && !(fp->_flags & _IO_CURRENTLY_PUTTING))
|
|
{
|
|
fp->_flags |= _IO_CURRENTLY_PUTTING;
|
|
fp->_IO_write_ptr = fp->_IO_read_ptr;
|
|
fp->_IO_read_ptr = fp->_IO_read_end;
|
|
}
|
|
pos = fp->_IO_write_ptr - fp->_IO_write_base;
|
|
if (pos >= (_IO_size_t) (_IO_blen (fp) + flush_only))
|
|
{
|
|
if (fp->_flags & _IO_USER_BUF) /* not allowed to enlarge */
|
|
return EOF;
|
|
else
|
|
{
|
|
char *new_buf;
|
|
char *old_buf = fp->_IO_buf_base;
|
|
_IO_size_t new_size = 2 * _IO_blen (fp) + 100;
|
|
new_buf
|
|
= (char *) (*((_IO_strfile *) fp)->_s._allocate_buffer) (new_size);
|
|
if (new_buf == NULL)
|
|
{
|
|
/* __ferror(fp) = 1; */
|
|
return EOF;
|
|
}
|
|
if (fp->_IO_buf_base)
|
|
{
|
|
memcpy (new_buf, old_buf, _IO_blen (fp));
|
|
(*((_IO_strfile *) fp)->_s._free_buffer) (fp->_IO_buf_base);
|
|
/* Make sure _IO_setb won't try to delete _IO_buf_base. */
|
|
fp->_IO_buf_base = NULL;
|
|
}
|
|
#if 0
|
|
if (lenp == &LEN(fp)) /* use '\0'-filling */
|
|
memset (new_buf + pos, 0, blen() - pos);
|
|
#endif
|
|
_IO_setb (fp, new_buf, new_buf + new_size, 1);
|
|
fp->_IO_read_base = new_buf + (fp->_IO_read_base - old_buf);
|
|
fp->_IO_read_ptr = new_buf + (fp->_IO_read_ptr - old_buf);
|
|
fp->_IO_read_end = new_buf + (fp->_IO_read_end - old_buf);
|
|
fp->_IO_write_ptr = new_buf + (fp->_IO_write_ptr - old_buf);
|
|
|
|
fp->_IO_write_base = new_buf;
|
|
fp->_IO_write_end = fp->_IO_buf_end;
|
|
}
|
|
}
|
|
|
|
if (!flush_only)
|
|
*fp->_IO_write_ptr++ = (unsigned char) c;
|
|
if (fp->_IO_write_ptr > fp->_IO_read_end)
|
|
fp->_IO_read_end = fp->_IO_write_ptr;
|
|
return c;
|
|
}
|
|
|
|
int
|
|
_IO_str_underflow (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
if (fp->_IO_write_ptr > fp->_IO_read_end)
|
|
fp->_IO_read_end = fp->_IO_write_ptr;
|
|
if ((fp->_flags & _IO_TIED_PUT_GET) && (fp->_flags & _IO_CURRENTLY_PUTTING))
|
|
{
|
|
fp->_flags &= ~_IO_CURRENTLY_PUTTING;
|
|
fp->_IO_read_ptr = fp->_IO_write_ptr;
|
|
fp->_IO_write_ptr = fp->_IO_write_end;
|
|
}
|
|
if (fp->_IO_read_ptr < fp->_IO_read_end)
|
|
return *fp->_IO_read_ptr;
|
|
else
|
|
return EOF;
|
|
}
|
|
|
|
/* The size of the valid part of the buffer. */
|
|
|
|
_IO_ssize_t
|
|
_IO_str_count (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
return ((fp->_IO_write_end > fp->_IO_read_end
|
|
? fp->_IO_write_end : fp->_IO_read_end)
|
|
- fp->_IO_read_base);
|
|
}
|
|
|
|
_IO_pos_t
|
|
_IO_str_seekoff (fp, offset, dir, mode)
|
|
_IO_FILE *fp;
|
|
_IO_off_t offset;
|
|
int dir;
|
|
int mode;
|
|
{
|
|
_IO_ssize_t cur_size = _IO_str_count (fp);
|
|
_IO_pos_t 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->_IO_read_ptr - fp->_IO_read_base;
|
|
break;
|
|
default: /* case _IO_seek_set: */
|
|
break;
|
|
}
|
|
if (offset < 0 || (_IO_ssize_t) offset > cur_size)
|
|
return EOF;
|
|
fp->_IO_read_ptr = fp->_IO_read_base + offset;
|
|
fp->_IO_read_end = fp->_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->_IO_write_ptr - fp->_IO_write_base;
|
|
break;
|
|
default: /* case _IO_seek_set: */
|
|
break;
|
|
}
|
|
if (offset < 0 || (_IO_ssize_t) offset > cur_size)
|
|
return EOF;
|
|
fp->_IO_write_ptr = fp->_IO_write_base + offset;
|
|
new_pos = offset;
|
|
}
|
|
return new_pos;
|
|
}
|
|
|
|
int
|
|
_IO_str_pbackfail (fp, c)
|
|
_IO_FILE *fp;
|
|
int c;
|
|
{
|
|
if ((fp->_flags & _IO_NO_WRITES) && c != EOF)
|
|
return EOF;
|
|
return _IO_default_pbackfail (fp, c);
|
|
}
|
|
|
|
void
|
|
_IO_str_finish (fp, dummy)
|
|
_IO_FILE *fp;
|
|
int dummy;
|
|
{
|
|
if (fp->_IO_buf_base && !(fp->_flags & _IO_USER_BUF))
|
|
(((_IO_strfile *) fp)->_s._free_buffer) (fp->_IO_buf_base);
|
|
fp->_IO_buf_base = NULL;
|
|
|
|
_IO_default_finish (fp, 0);
|
|
}
|
|
|
|
struct _IO_jump_t _IO_str_jumps =
|
|
{
|
|
JUMP_INIT_DUMMY,
|
|
JUMP_INIT(finish, _IO_str_finish),
|
|
JUMP_INIT(overflow, _IO_str_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)
|
|
};
|