mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-24 11:41:07 +00:00
9964a14579
This patch mechanically removes all remaining uses, and the definitions, of the following libio name aliases: name replaced with ---- ------------- _IO_FILE FILE _IO_fpos_t __fpos_t _IO_fpos64_t __fpos64_t _IO_size_t size_t _IO_ssize_t ssize_t or __ssize_t _IO_off_t off_t _IO_off64_t off64_t _IO_pid_t pid_t _IO_uid_t uid_t _IO_wint_t wint_t _IO_va_list va_list or __gnuc_va_list _IO_BUFSIZ BUFSIZ _IO_cookie_io_functions_t cookie_io_functions_t __io_read_fn cookie_read_function_t __io_write_fn cookie_write_function_t __io_seek_fn cookie_seek_function_t __io_close_fn cookie_close_function_t I used __fpos_t and __fpos64_t instead of fpos_t and fpos64_t because the definitions of fpos_t and fpos64_t depend on the largefile mode. I used __ssize_t and __gnuc_va_list in a handful of headers where namespace cleanliness might be relevant even though they're internal-use-only. In all other cases, I used the public-namespace name. There are a tiny handful of places where I left a use of 'struct _IO_FILE' alone, because it was being used together with 'struct _IO_FILE_plus' or 'struct _IO_FILE_complete' in the same arithmetic expression. Because this patch was almost entirely done with search and replace, I may have introduced indentation botches. I did proofread the diff, but I may have missed something. The ChangeLog below calls out all of the places where this was not a pure search-and-replace change. Installed stripped libraries and executables are unchanged by this patch, except that some assertions in vfscanf.c change line numbers. * libio/libio.h (_IO_FILE): Delete; all uses changed to FILE. (_IO_fpos_t): Delete; all uses changed to __fpos_t. (_IO_fpos64_t): Delete; all uses changed to __fpos64_t. (_IO_size_t): Delete; all uses changed to size_t. (_IO_ssize_t): Delete; all uses changed to ssize_t or __ssize_t. (_IO_off_t): Delete; all uses changed to off_t. (_IO_off64_t): Delete; all uses changed to off64_t. (_IO_pid_t): Delete; all uses changed to pid_t. (_IO_uid_t): Delete; all uses changed to uid_t. (_IO_wint_t): Delete; all uses changed to wint_t. (_IO_va_list): Delete; all uses changed to va_list or __gnuc_va_list. (_IO_BUFSIZ): Delete; all uses changed to BUFSIZ. (_IO_cookie_io_functions_t): Delete; all uses changed to cookie_io_functions_t. (__io_read_fn): Delete; all uses changed to cookie_read_function_t. (__io_write_fn): Delete; all uses changed to cookie_write_function_t. (__io_seek_fn): Delete; all uses changed to cookie_seek_function_t. (__io_close_fn): Delete: all uses changed to cookie_close_function_t. * libio/iofopncook.c: Remove unnecessary forward declarations. * libio/iolibio.h: Correct outdated commentary. * malloc/malloc.c (__malloc_stats): Remove unnecessary casts. * stdio-common/fxprintf.c (__fxprintf_nocancel): Remove unnecessary casts. * stdio-common/getline.c: Use _IO_getdelim directly. Don't redefine ssize_t. * stdio-common/printf_fp.c, stdio_common/printf_fphex.c * stdio-common/printf_size.c: Don't redefine size_t or FILE. Remove outdated comments. * stdio-common/vfscanf.c: Don't redefine va_list.
280 lines
7.6 KiB
C
280 lines
7.6 KiB
C
/* Copyright (C) 1993-2018 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, see
|
|
<http://www.gnu.org/licenses/>.
|
|
|
|
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>
|
|
|
|
static ssize_t
|
|
_IO_cookie_read (FILE *fp, void *buf, ssize_t size)
|
|
{
|
|
struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp;
|
|
cookie_read_function_t *read_cb = cfile->__io_functions.read;
|
|
#ifdef PTR_DEMANGLE
|
|
PTR_DEMANGLE (read_cb);
|
|
#endif
|
|
|
|
if (read_cb == NULL)
|
|
return -1;
|
|
|
|
return read_cb (cfile->__cookie, buf, size);
|
|
}
|
|
|
|
static ssize_t
|
|
_IO_cookie_write (FILE *fp, const void *buf, ssize_t size)
|
|
{
|
|
struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp;
|
|
cookie_write_function_t *write_cb = cfile->__io_functions.write;
|
|
#ifdef PTR_DEMANGLE
|
|
PTR_DEMANGLE (write_cb);
|
|
#endif
|
|
|
|
if (write_cb == NULL)
|
|
{
|
|
fp->_flags |= _IO_ERR_SEEN;
|
|
return 0;
|
|
}
|
|
|
|
ssize_t n = write_cb (cfile->__cookie, buf, size);
|
|
if (n < size)
|
|
fp->_flags |= _IO_ERR_SEEN;
|
|
|
|
return n;
|
|
}
|
|
|
|
static off64_t
|
|
_IO_cookie_seek (FILE *fp, off64_t offset, int dir)
|
|
{
|
|
struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp;
|
|
cookie_seek_function_t *seek_cb = cfile->__io_functions.seek;
|
|
#ifdef PTR_DEMANGLE
|
|
PTR_DEMANGLE (seek_cb);
|
|
#endif
|
|
|
|
return ((seek_cb == NULL
|
|
|| (seek_cb (cfile->__cookie, &offset, dir)
|
|
== -1)
|
|
|| offset == (off64_t) -1)
|
|
? _IO_pos_BAD : offset);
|
|
}
|
|
|
|
static int
|
|
_IO_cookie_close (FILE *fp)
|
|
{
|
|
struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp;
|
|
cookie_close_function_t *close_cb = cfile->__io_functions.close;
|
|
#ifdef PTR_DEMANGLE
|
|
PTR_DEMANGLE (close_cb);
|
|
#endif
|
|
|
|
if (close_cb == NULL)
|
|
return 0;
|
|
|
|
return close_cb (cfile->__cookie);
|
|
}
|
|
|
|
|
|
static off64_t
|
|
_IO_cookie_seekoff (FILE *fp, off64_t offset, int dir, int mode)
|
|
{
|
|
/* We must force the fileops code to always use seek to determine
|
|
the position. */
|
|
fp->_offset = _IO_pos_BAD;
|
|
return _IO_file_seekoff (fp, offset, dir, mode);
|
|
}
|
|
|
|
|
|
static const struct _IO_jump_t _IO_cookie_jumps libio_vtable = {
|
|
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_cookie_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),
|
|
};
|
|
|
|
|
|
/* Copy the callbacks from SOURCE to *TARGET, with pointer
|
|
mangling. */
|
|
static void
|
|
set_callbacks (cookie_io_functions_t *target,
|
|
cookie_io_functions_t source)
|
|
{
|
|
#ifdef PTR_MANGLE
|
|
PTR_MANGLE (source.read);
|
|
PTR_MANGLE (source.write);
|
|
PTR_MANGLE (source.seek);
|
|
PTR_MANGLE (source.close);
|
|
#endif
|
|
*target = source;
|
|
}
|
|
|
|
void
|
|
_IO_cookie_init (struct _IO_cookie_file *cfile, int read_write,
|
|
void *cookie, cookie_io_functions_t io_functions)
|
|
{
|
|
_IO_init_internal (&cfile->__fp.file, 0);
|
|
_IO_JUMPS (&cfile->__fp) = &_IO_cookie_jumps;
|
|
|
|
cfile->__cookie = cookie;
|
|
set_callbacks (&cfile->__io_functions, io_functions);
|
|
|
|
_IO_new_file_init_internal (&cfile->__fp);
|
|
|
|
_IO_mask_flags (&cfile->__fp.file, read_write,
|
|
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
|
|
|
|
cfile->__fp.file._flags2 |= _IO_FLAGS2_NEED_LOCK;
|
|
|
|
/* 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;
|
|
}
|
|
|
|
|
|
FILE *
|
|
_IO_fopencookie (void *cookie, const char *mode,
|
|
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:
|
|
__set_errno (EINVAL);
|
|
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 (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 off64_t
|
|
attribute_compat_text_section
|
|
_IO_old_cookie_seek (FILE *fp, off64_t offset, int dir)
|
|
{
|
|
struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp;
|
|
int (*seek_cb) (FILE *, off_t, int)
|
|
= (int (*) (FILE *, off_t, int)) cfile->__io_functions.seek;
|
|
#ifdef PTR_DEMANGLE
|
|
PTR_DEMANGLE (seek_cb);
|
|
#endif
|
|
|
|
if (seek_cb == NULL)
|
|
return _IO_pos_BAD;
|
|
|
|
int ret = seek_cb (cfile->__cookie, offset, dir);
|
|
|
|
return (ret == -1) ? _IO_pos_BAD : ret;
|
|
}
|
|
|
|
static const struct _IO_jump_t _IO_old_cookie_jumps libio_vtable = {
|
|
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_cookie_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),
|
|
};
|
|
|
|
FILE *
|
|
attribute_compat_text_section
|
|
_IO_old_fopencookie (void *cookie, const char *mode,
|
|
cookie_io_functions_t io_functions)
|
|
{
|
|
FILE *ret;
|
|
|
|
ret = _IO_fopencookie (cookie, mode, io_functions);
|
|
if (ret != NULL)
|
|
_IO_JUMPS_FILE_plus (ret) = &_IO_old_cookie_jumps;
|
|
|
|
return ret;
|
|
}
|
|
|
|
compat_symbol (libc, _IO_old_fopencookie, fopencookie, GLIBC_2_0);
|
|
|
|
#endif
|