mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 03:10:05 +00:00
f8b87ef0d4
Thu Dec 12 03:32:21 1996 Ulrich Drepper <drepper@cygnus.com> * libio/_G_config.h: Add definition of _G_int16_t, _G_int32_t, _G_uint16_t, _G_uin32_t, _G_HAVE_BOOL, _G_HAVE_MMAP, and _G_ARGS. Change libio buffer handling to allocate internal buffers using mmap if possible. * libio/filedoalloc.c (_IO_file_doallocate): Change call to ALLOC_BUF. * libio/genops.c (_IO_setb, _IO_default_finish): Change call to FREE_BUF. (_IO_default_doallocate): Change call to ALLOC_BUF. * libio/libioP.h: Change definition of ALLOC_BUF and FREE_BUF to use mmap/munmap when possible. * libio/memstream.c: Don't use ALLOC_BUF, but directly malloc. * libio/vasprintf.c: Likewise. Patch by HJ Lu. * libio/libio.h: Define NULL as __null only for gcc-2.8 and up. * libio/libioP.h: Likewise. * libio/fileops.c (_IO_file_read, _IO_file_write): Don't restart syscall when EINTR was returned. Necessary for POSIX.1. * libio/strops.c (_IO_str_overflow): Add cast to prevent warning. * new-malloc/malloc.c (heap_trim): Correctly place parentheses to prevent warnings. * nis/Makefile: Remove rules for bsd-tools which are not part of glibc. Patch by Thorsten Kukuk. * nis/ypclnt.c: Add prototype for xdr_free. Add const to first parameter for __yp_bind. * nis/nss_compat/compat-pwd.c (getpwent_next_netgr, getpwent_next_nis, getpwent_next_file): Variable `p2len' must have type size_t. * nis/nss_nis/nis-alias.c: Add casts to prevent warnings. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/rpcsvc/yp_prot.h (ypreq_key): Change type of members to `const char *'. (ypmaplist): Change member names to `map' and `next' and provide #defines for old names. Patch by Thorsten Kukuk. * nss/nss_files/files-parse.c (parse_line, parse_list): Change type for `datalen' parameter to size_t. * shsdow/lckpwdf.c: Use fcntl forlocking, not flock. * stdio-common/printf.c [USE_IN_LIBIO]: Provide alias _IO_printf for printf. * stdio-common/sscanf.c [USE_IN_LIBIO]: Provide alias _IO_sscanf for sscanf. Patch by HJ Lu. * stdio-common/tmpfile.c: Update copyright. * stdio-common/vfscanf.c: Correctly handle EINTR error from fgetc function. Don't eat white space for `C' format. * stdlib/tst-strtol.c [~0UL != 0xffffffff]: Fix typo in test data. * sysdeps/generic/abort.c: Update copyright. De-ANSI-declfy. * sysdeps/i386/abort.c: Removed. This version does not use signal SIGABRT. * sysdeps/i386/fpu/__math.h: Define __NO_MATH_INLINES if not using gcc-2.8 or up. Patch by HJ Lu. * sysdeps/posix/tempname.c: Test for error but EEXIST after open call. If EMFILE, ENFILE, or EINTR return with error. Wed Dec 11 14:43:52 1996 Ulrich Drepper <drepper@cygnus.com> * gnu-versions.h: Set _GNU_OBSTACK_INTERFACE_VERSION back to 1. We are compatible again. * new-malloc/obstack.h (struct obstack): Add back alloc_failed bit even though it is not used. * malloc/obstack.h: Likewise. * new-malloc/obstack.c (_obstack_begin, _obstack_begin_1): Initialize alloc_failed bit to 0. * time/strftime.c: Extend for Emacs' needs. Recognize field width, %P format and `0' modifier. Tue Dec 10 21:20:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules (make-link): Don't discard exit codes of intermediate commands. Always use rellns-sh if symbolic links are available. Tue Dec 10 20:09:51 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/netinet/in.h: Enclose #include <linux/in.h> in __BEGIN_DECLS/__END_DECLS to avoid linkage conflict of ntohs etc. in <asm/byteorder.h>.
144 lines
3.8 KiB
C
144 lines
3.8 KiB
C
/* Copyright (C) 1995, 1996 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 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. */
|
|
|
|
#include "libioP.h"
|
|
#include "strfile.h"
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
|
|
struct _IO_FILE_memstream
|
|
{
|
|
_IO_strfile _sf;
|
|
char **bufloc;
|
|
_IO_size_t *sizeloc;
|
|
};
|
|
|
|
|
|
static int _IO_mem_sync __P ((_IO_FILE* fp));
|
|
static void _IO_mem_finish __P ((_IO_FILE* fp));
|
|
|
|
|
|
static const struct _IO_jump_t _IO_mem_jumps =
|
|
{
|
|
JUMP_INIT_DUMMY,
|
|
JUMP_INIT (finish, _IO_mem_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_mem_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)
|
|
};
|
|
|
|
/* Open a stream that writes into a malloc'd buffer that is expanded as
|
|
necessary. *BUFLOC and *SIZELOC are updated with the buffer's location
|
|
and the number of characters written on fflush or fclose. */
|
|
_IO_FILE *
|
|
open_memstream (bufloc, sizeloc)
|
|
char **bufloc;
|
|
_IO_size_t *sizeloc;
|
|
{
|
|
struct locked_FILE
|
|
{
|
|
struct _IO_FILE_memstream fp;
|
|
#ifdef _IO_MTSAFE_IO
|
|
_IO_lock_t lock;
|
|
#endif
|
|
} *new_f;
|
|
char *buf;
|
|
|
|
new_f = (struct locked_FILE *) malloc (sizeof (struct locked_FILE));
|
|
if (new_f == NULL)
|
|
return NULL;
|
|
#ifdef _IO_MTSAFE_IO
|
|
new_f->fp._sf._sbf._f._lock = &new_f->lock;
|
|
#endif
|
|
|
|
buf = malloc (_IO_BUFSIZ);
|
|
if (buf == NULL)
|
|
return NULL;
|
|
_IO_init (&new_f->fp._sf._sbf._f, 0);
|
|
_IO_JUMPS (&new_f->fp._sf._sbf._f) = &_IO_mem_jumps;
|
|
_IO_str_init_static (&new_f->fp._sf._sbf._f, buf, _IO_BUFSIZ, buf);
|
|
new_f->fp._sf._sbf._f._flags &= ~_IO_USER_BUF;
|
|
new_f->fp._sf._s._allocate_buffer = (_IO_alloc_type) malloc;
|
|
new_f->fp._sf._s._free_buffer = (_IO_free_type) free;
|
|
|
|
new_f->fp.bufloc = bufloc;
|
|
new_f->fp.sizeloc = sizeloc;
|
|
|
|
return &new_f->fp._sf._sbf._f;
|
|
}
|
|
|
|
|
|
static int
|
|
_IO_mem_sync (fp)
|
|
_IO_FILE* fp;
|
|
{
|
|
struct _IO_FILE_memstream *mp = (struct _IO_FILE_memstream *) fp;
|
|
int res;
|
|
|
|
res = _IO_default_sync (fp);
|
|
if (res < 0)
|
|
return res;
|
|
|
|
if (fp->_IO_write_ptr == fp->_IO_write_end)
|
|
{
|
|
_IO_str_overflow (fp, '\0');
|
|
--fp->_IO_write_ptr;
|
|
}
|
|
else
|
|
*fp->_IO_write_ptr = '\0';
|
|
|
|
*mp->bufloc = fp->_IO_write_base;
|
|
*mp->sizeloc = fp->_IO_write_ptr - fp->_IO_write_base;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static void
|
|
_IO_mem_finish (fp)
|
|
_IO_FILE* fp;
|
|
{
|
|
struct _IO_FILE_memstream *mp = (struct _IO_FILE_memstream *) fp;
|
|
|
|
*mp->bufloc = (char *) realloc (fp->_IO_write_base,
|
|
fp->_IO_write_ptr - fp->_IO_write_base + 1);
|
|
if (*mp->bufloc != NULL)
|
|
{
|
|
(*mp->bufloc)[fp->_IO_write_ptr - fp->_IO_write_base] = '\0';
|
|
*mp->sizeloc = fp->_IO_write_ptr - fp->_IO_write_base;
|
|
}
|
|
|
|
fp->_IO_buf_base = NULL;
|
|
|
|
_IO_default_finish (fp);
|
|
}
|