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
257 lines
7.5 KiB
C
257 lines
7.5 KiB
C
/* Copyright (C) 1993,95,97,99,2000,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 <libioP.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <shlib-compat.h>
|
|
|
|
/* Prototyped for local functions. */
|
|
static _IO_ssize_t _IO_cookie_read (register _IO_FILE* fp, void* buf,
|
|
_IO_ssize_t size);
|
|
static _IO_ssize_t _IO_cookie_write (register _IO_FILE* fp,
|
|
const void* buf, _IO_ssize_t size);
|
|
static _IO_off64_t _IO_cookie_seek (_IO_FILE *fp, _IO_off64_t offset, int dir);
|
|
static int _IO_cookie_close (_IO_FILE* fp);
|
|
|
|
static _IO_ssize_t
|
|
_IO_cookie_read (fp, buf, size)
|
|
_IO_FILE *fp;
|
|
void *buf;
|
|
_IO_ssize_t size;
|
|
{
|
|
struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp;
|
|
|
|
if (cfile->__io_functions.read == NULL)
|
|
return -1;
|
|
|
|
return cfile->__io_functions.read (cfile->__cookie, buf, size);
|
|
}
|
|
|
|
static _IO_ssize_t
|
|
_IO_cookie_write (fp, buf, size)
|
|
_IO_FILE *fp;
|
|
const void *buf;
|
|
_IO_ssize_t size;
|
|
{
|
|
struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp;
|
|
|
|
if (cfile->__io_functions.write == NULL)
|
|
return -1;
|
|
|
|
return cfile->__io_functions.write (cfile->__cookie, buf, size);
|
|
}
|
|
|
|
static _IO_off64_t
|
|
_IO_cookie_seek (fp, offset, dir)
|
|
_IO_FILE *fp;
|
|
_IO_off64_t offset;
|
|
int dir;
|
|
{
|
|
struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp;
|
|
|
|
return ((cfile->__io_functions.seek == NULL
|
|
|| (cfile->__io_functions.seek (cfile->__cookie, &offset, dir)
|
|
== -1)
|
|
|| offset == (_IO_off64_t) -1)
|
|
? _IO_pos_BAD : offset);
|
|
}
|
|
|
|
static int
|
|
_IO_cookie_close (fp)
|
|
_IO_FILE *fp;
|
|
{
|
|
struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp;
|
|
|
|
if (cfile->__io_functions.close == NULL)
|
|
return 0;
|
|
|
|
return cfile->__io_functions.close (cfile->__cookie);
|
|
}
|
|
|
|
|
|
static struct _IO_jump_t _IO_cookie_jumps = {
|
|
JUMP_INIT_DUMMY,
|
|
JUMP_INIT(finish, INTUSE(_IO_file_finish)),
|
|
JUMP_INIT(overflow, INTUSE(_IO_file_overflow)),
|
|
JUMP_INIT(underflow, INTUSE(_IO_file_underflow)),
|
|
JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
|
|
JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)),
|
|
JUMP_INIT(xsputn, INTUSE(_IO_file_xsputn)),
|
|
JUMP_INIT(xsgetn, INTUSE(_IO_default_xsgetn)),
|
|
JUMP_INIT(seekoff, INTUSE(_IO_file_seekoff)),
|
|
JUMP_INIT(seekpos, _IO_default_seekpos),
|
|
JUMP_INIT(setbuf, INTUSE(_IO_file_setbuf)),
|
|
JUMP_INIT(sync, INTUSE(_IO_file_sync)),
|
|
JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)),
|
|
JUMP_INIT(read, _IO_cookie_read),
|
|
JUMP_INIT(write, _IO_cookie_write),
|
|
JUMP_INIT(seek, _IO_cookie_seek),
|
|
JUMP_INIT(close, _IO_cookie_close),
|
|
JUMP_INIT(stat, _IO_default_stat),
|
|
JUMP_INIT(showmanyc, _IO_default_showmanyc),
|
|
JUMP_INIT(imbue, _IO_default_imbue),
|
|
};
|
|
|
|
|
|
void
|
|
_IO_cookie_init (struct _IO_cookie_file *cfile, int read_write,
|
|
void *cookie, _IO_cookie_io_functions_t io_functions)
|
|
{
|
|
INTUSE(_IO_init) (&cfile->__fp.file, 0);
|
|
_IO_JUMPS (&cfile->__fp) = &_IO_cookie_jumps;
|
|
|
|
cfile->__cookie = cookie;
|
|
cfile->__io_functions = io_functions;
|
|
|
|
INTUSE(_IO_file_init) (&cfile->__fp);
|
|
|
|
cfile->__fp.file._IO_file_flags =
|
|
_IO_mask_flags (&cfile->__fp.file, read_write,
|
|
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
|
|
|
|
/* We use a negative number different from -1 for _fileno to mark that
|
|
this special stream is not associated with a real file, but still has
|
|
to be treated as such. */
|
|
cfile->__fp.file._fileno = -2;
|
|
}
|
|
|
|
|
|
_IO_FILE *
|
|
_IO_fopencookie (cookie, mode, io_functions)
|
|
void *cookie;
|
|
const char *mode;
|
|
_IO_cookie_io_functions_t io_functions;
|
|
{
|
|
int read_write;
|
|
struct locked_FILE
|
|
{
|
|
struct _IO_cookie_file cfile;
|
|
#ifdef _IO_MTSAFE_IO
|
|
_IO_lock_t lock;
|
|
#endif
|
|
} *new_f;
|
|
|
|
switch (*mode++)
|
|
{
|
|
case 'r':
|
|
read_write = _IO_NO_WRITES;
|
|
break;
|
|
case 'w':
|
|
read_write = _IO_NO_READS;
|
|
break;
|
|
case 'a':
|
|
read_write = _IO_NO_READS|_IO_IS_APPENDING;
|
|
break;
|
|
default:
|
|
return NULL;
|
|
}
|
|
if (mode[0] == '+' || (mode[0] == 'b' && mode[1] == '+'))
|
|
read_write &= _IO_IS_APPENDING;
|
|
|
|
new_f = (struct locked_FILE *) malloc (sizeof (struct locked_FILE));
|
|
if (new_f == NULL)
|
|
return NULL;
|
|
#ifdef _IO_MTSAFE_IO
|
|
new_f->cfile.__fp.file._lock = &new_f->lock;
|
|
#endif
|
|
|
|
_IO_cookie_init (&new_f->cfile, read_write, cookie, io_functions);
|
|
|
|
return (_IO_FILE *) &new_f->cfile.__fp;
|
|
}
|
|
|
|
versioned_symbol (libc, _IO_fopencookie, fopencookie, GLIBC_2_2);
|
|
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
|
|
|
|
static _IO_off64_t _IO_old_cookie_seek (_IO_FILE *fp, _IO_off64_t offset,
|
|
int dir);
|
|
_IO_FILE * _IO_old_fopencookie (void *cookie, const char *mode,
|
|
_IO_cookie_io_functions_t io_functions);
|
|
|
|
static _IO_off64_t
|
|
_IO_old_cookie_seek (fp, offset, dir)
|
|
_IO_FILE *fp;
|
|
_IO_off64_t offset;
|
|
int dir;
|
|
{
|
|
struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp;
|
|
int (*seek) (_IO_FILE *, _IO_off_t, int);
|
|
int ret;
|
|
|
|
seek = (int (*)(_IO_FILE *, _IO_off_t, int)) cfile->__io_functions.seek;
|
|
if (seek == NULL)
|
|
return _IO_pos_BAD;
|
|
|
|
ret = seek (cfile->__cookie, offset, dir);
|
|
|
|
return (ret == -1) ? _IO_pos_BAD : ret;
|
|
}
|
|
|
|
static struct _IO_jump_t _IO_old_cookie_jumps = {
|
|
JUMP_INIT_DUMMY,
|
|
JUMP_INIT(finish, INTUSE(_IO_file_finish)),
|
|
JUMP_INIT(overflow, INTUSE(_IO_file_overflow)),
|
|
JUMP_INIT(underflow, INTUSE(_IO_file_underflow)),
|
|
JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
|
|
JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)),
|
|
JUMP_INIT(xsputn, INTUSE(_IO_file_xsputn)),
|
|
JUMP_INIT(xsgetn, INTUSE(_IO_default_xsgetn)),
|
|
JUMP_INIT(seekoff, INTUSE(_IO_file_seekoff)),
|
|
JUMP_INIT(seekpos, _IO_default_seekpos),
|
|
JUMP_INIT(setbuf, INTUSE(_IO_file_setbuf)),
|
|
JUMP_INIT(sync, INTUSE(_IO_file_sync)),
|
|
JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)),
|
|
JUMP_INIT(read, _IO_cookie_read),
|
|
JUMP_INIT(write, _IO_cookie_write),
|
|
JUMP_INIT(seek, _IO_old_cookie_seek),
|
|
JUMP_INIT(close, _IO_cookie_close),
|
|
JUMP_INIT(stat, _IO_default_stat),
|
|
JUMP_INIT(showmanyc, _IO_default_showmanyc),
|
|
JUMP_INIT(imbue, _IO_default_imbue),
|
|
};
|
|
|
|
_IO_FILE *
|
|
_IO_old_fopencookie (cookie, mode, io_functions)
|
|
void *cookie;
|
|
const char *mode;
|
|
_IO_cookie_io_functions_t io_functions;
|
|
{
|
|
_IO_FILE *ret;
|
|
|
|
ret = _IO_fopencookie (cookie, mode, io_functions);
|
|
if (ret != NULL)
|
|
_IO_JUMPS ((struct _IO_FILE_plus *) ret) = &_IO_old_cookie_jumps;
|
|
|
|
return ret;
|
|
}
|
|
|
|
compat_symbol (libc, _IO_old_fopencookie, fopencookie, GLIBC_2_0);
|
|
|
|
#endif
|