mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 23:00:07 +00:00
2ca8b1eef9
* libio/libio.h (struct _IO_cookie_file): Move struct type defintion out. (_IO_FILE): Declare chain as (struct _IO_FILE_plus *). * libio/libioP.h (struct _IO_cookie_file): Move struct type defintion in. (_IO_JUMPS): Don't cast THIS--expect arg to be a (struct _IO_FILE_plus *). (_IO_JUMPS_FUNC): Express in terms of _IO_JUMPS, and add cast to THIS, since _IO_JUMPS no longer does it implicitly. (_IO_file_init, _IO_old_file_init, _IO_new_file_init): Declare arg type as (struct _IO_FILE_plus *). (_IO_str_init_static, _IO_str_init_readonly): Declare 1st arg as (_IO_strfile *). * libio/strops.c (_IO_str_init_static, _IO_str_init_readonly): Declare 1st arg as (_IO_strfile *). * libio/fileops.c (_IO_new_file_init): Declare arg type as (struct _IO_FILE_plus *). * libio/oldfileops.c (_IO_old_file_init): Likewise. * libio/genops.c (_IO_link_in, _IO_un_link): Likewise. (_IO_flush_all, _IO_flush_all_linebuffered, _IO_unbuffer_write): Declare iteration pointer as (struct _IO_FILE_plus *). (_IO_iter_next, _IO_iter_file): _IO_ITER is now (struct _IO_FILE_plus *). * libio/stdfiles.c (_IO_list_all): Declare as (struct _IO_FILE_plus *). * libio/oldstdfiles.c (_IO_list_all): Likewise. (_IO_check_libio): Set user-visible handles to (struct _IO_FILE_plus *). * libio/stdio.c (stdin, stdout, stderr): Set user-visible handles to (struct _IO_FILE_plus *). * libio/iofdopen.c (_IO_new_fdopen): Pass FILE handle pointer whose high bound includes vtable to all functions that will use vtable. For streambufs, pass pointer whose bounds include struct _IO_strfile. * libio/wgenops.c (_IO_wdefault_finish): Likewise. * libio/oldiofdopen.c (_IO_old_fdopen): Likewise. * libio/iofopen.c (_IO_new_fopen): Likewise. * libio/oldiofopen.c (_IO_old_fopen): Likewise. * libio/iofopen64.c (_IO_fopen64): Likewise. * libio/iopopen.c (_IO_new_popen): Likewise. * libio/oldiopopen.c (_IO_old_popen): Likewise. * libio/memstream.c (open_memstream): Likewise. * libio/iovsscanf.c (_IO_vsscanf): Likewise. * libio/iovsprintf.c (_IO_vsprintf): Likewise. * libio/iovdprintf.c (_IO_vdprintf): Likewise. * libio/iofopncook.c (_IO_cookie_init): Likewise. * libio/obprintf.c (_IO_obstack_vprintf): Likewise. * libio/vasprintf.c (_IO_vasprintf): Likewise. * libio/vsnprintf.c (_IO_vsnprintf): Likewise. * libio/stdfiles.c (_IO_stdout_, _IO_stderr_): Likewise. * libio/oldstdfiles.c (_IO_stdout_, _IO_stderr_): Likewise. * stdlib/strfmon.c (__strfmon_l): Likewise. * stdio-common/vfprintf.c (buffered_vfprintf): Likewise. (vfprintf): Qualify computed-goto targets as unbounded. 2000-06-28 Greg McGary <greg@mcgary.org> * libio/libio.h (struct _IO_cookie_file): Move struct type defintion out. (_IO_FILE): Declare chain as (struct _IO_FILE_plus *). * libio/libioP.h (struct _IO_cookie_file): Move struct type defintion in. (_IO_JUMPS): Don't cast THIS--expect arg to be a (struct _IO_FILE_plus *). (_IO_JUMPS_FUNC): Express in terms of _IO_JUMPS, and add cast to THIS, since _IO_JUMPS no longer does it implicitly. (_IO_file_init, _IO_old_file_init, _IO_new_file_init): Declare arg type as (struct _IO_FILE_plus *). (_IO_str_init_static, _IO_str_init_readonly): Declare 1st arg as (_IO_strfile *). * libio/strops.c (_IO_str_init_static, _IO_str_init_readonly): Declare 1st arg as (_IO_strfile *). * libio/fileops.c (_IO_new_file_init): Declare arg type as (struct _IO_FILE_plus *). * libio/oldfileops.c (_IO_old_file_init): Likewise. * libio/genops.c (_IO_link_in, _IO_un_link): Likewise. (_IO_flush_all, _IO_flush_all_linebuffered, _IO_unbuffer_write): Declare iteration pointer as (struct _IO_FILE_plus *). (_IO_iter_next, _IO_iter_file): _IO_ITER is now (struct _IO_FILE_plus *). * libio/stdfiles.c (_IO_list_all): Declare as (struct _IO_FILE_plus *). * libio/oldstdfiles.c (_IO_list_all): Likewise. (_IO_check_libio): Set user-visible handles to (struct _IO_FILE_plus *). * libio/stdio.c (stdin, stdout, stderr): Set user-visible handles to (struct _IO_FILE_plus *). * libio/iofdopen.c (_IO_new_fdopen): Pass FILE handle pointer whose high bound includes vtable to all functions that will use vtable. For streambufs, pass pointer whose bounds include struct _IO_strfile. * libio/wgenops.c (_IO_wdefault_finish): Likewise. * libio/oldiofdopen.c (_IO_old_fdopen): Likewise. * libio/iofopen.c (_IO_new_fopen): Likewise. * libio/oldiofopen.c (_IO_old_fopen): Likewise. * libio/iofopen64.c (_IO_fopen64): Likewise. * libio/iopopen.c (_IO_new_popen): Likewise. * libio/oldiopopen.c (_IO_old_popen): Likewise. * libio/memstream.c (open_memstream): Likewise. * libio/iovsscanf.c (_IO_vsscanf): Likewise. * libio/iovsprintf.c (_IO_vsprintf): Likewise. * libio/iovdprintf.c (_IO_vdprintf): Likewise. * libio/iofopncook.c (_IO_cookie_init): Likewise. * libio/obprintf.c (_IO_obstack_vprintf): Likewise. * libio/vasprintf.c (_IO_vasprintf): Likewise. * libio/vsnprintf.c (_IO_vsnprintf): Likewise. * libio/stdfiles.c (_IO_stdout_, _IO_stderr_): Likewise. * libio/oldstdfiles.c (_IO_stdout_, _IO_stderr_): Likewise. * stdlib/strfmon.c (__strfmon_l): Likewise. * stdio-common/vfprintf.c (buffered_vfprintf): Likewise. (vfprintf): Qualify computed-goto targets as unbounded.
256 lines
7.2 KiB
C
256 lines
7.2 KiB
C
/* Copyright (C) 1993,95,97,99,2000 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 <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);
|
|
_IO_FILE * _IO_fopencookie (void *cookie, const char *mode,
|
|
_IO_cookie_io_functions_t io_functions);
|
|
|
|
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)
|
|
== (_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, _IO_file_finish),
|
|
JUMP_INIT(overflow, _IO_file_overflow),
|
|
JUMP_INIT(underflow, _IO_file_underflow),
|
|
JUMP_INIT(uflow, _IO_default_uflow),
|
|
JUMP_INIT(pbackfail, _IO_default_pbackfail),
|
|
JUMP_INIT(xsputn, _IO_file_xsputn),
|
|
JUMP_INIT(xsgetn, _IO_default_xsgetn),
|
|
JUMP_INIT(seekoff, _IO_file_seekoff),
|
|
JUMP_INIT(seekpos, _IO_default_seekpos),
|
|
JUMP_INIT(setbuf, _IO_file_setbuf),
|
|
JUMP_INIT(sync, _IO_file_sync),
|
|
JUMP_INIT(doallocate, _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)
|
|
{
|
|
_IO_init (&cfile->__fp.file, 0);
|
|
_IO_JUMPS (&cfile->__fp) = &_IO_cookie_jumps;
|
|
|
|
cfile->__cookie = cookie;
|
|
cfile->__io_functions = io_functions;
|
|
|
|
_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, _IO_file_finish),
|
|
JUMP_INIT(overflow, _IO_file_overflow),
|
|
JUMP_INIT(underflow, _IO_file_underflow),
|
|
JUMP_INIT(uflow, _IO_default_uflow),
|
|
JUMP_INIT(pbackfail, _IO_default_pbackfail),
|
|
JUMP_INIT(xsputn, _IO_file_xsputn),
|
|
JUMP_INIT(xsgetn, _IO_default_xsgetn),
|
|
JUMP_INIT(seekoff, _IO_file_seekoff),
|
|
JUMP_INIT(seekpos, _IO_default_seekpos),
|
|
JUMP_INIT(setbuf, _IO_file_setbuf),
|
|
JUMP_INIT(sync, _IO_file_sync),
|
|
JUMP_INIT(doallocate, _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
|