mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 16:50: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.
133 lines
3.3 KiB
C
133 lines
3.3 KiB
C
/* Copyright (C) 1994-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/>. */
|
||
|
||
#include <hurd.h>
|
||
#include <stdio.h>
|
||
#include <fcntl.h>
|
||
#include <string.h>
|
||
|
||
/* Read up to N chars into BUF from COOKIE.
|
||
Return how many chars were read, 0 for EOF or -1 for error. */
|
||
static ssize_t
|
||
readio (void *cookie, char *buf, size_t n)
|
||
{
|
||
mach_msg_type_number_t nread;
|
||
error_t err;
|
||
char *bufp = buf;
|
||
|
||
nread = n;
|
||
if (err = __io_read ((io_t) cookie, &bufp, &nread, -1, n))
|
||
return __hurd_fail (err);
|
||
|
||
if (bufp != buf)
|
||
{
|
||
memcpy (buf, bufp, nread);
|
||
__vm_deallocate (__mach_task_self (),
|
||
(vm_address_t) bufp, (vm_size_t) nread);
|
||
}
|
||
|
||
return nread;
|
||
}
|
||
|
||
/* Write up to N chars from BUF to COOKIE.
|
||
Return how many chars were written or -1 for error. */
|
||
static ssize_t
|
||
writeio (void *cookie, const char *buf, size_t n)
|
||
{
|
||
mach_msg_type_number_t wrote;
|
||
error_t err;
|
||
|
||
if (err = __io_write ((io_t) cookie, buf, n, -1, &wrote))
|
||
return __hurd_fail (err);
|
||
|
||
return wrote;
|
||
}
|
||
|
||
/* Move COOKIE's file position *POS bytes, according to WHENCE.
|
||
The current file position is stored in *POS.
|
||
Returns zero if successful, nonzero if not. */
|
||
static int
|
||
seekio (void *cookie,
|
||
off64_t *pos,
|
||
int whence)
|
||
{
|
||
error_t err = __io_seek ((file_t) cookie, *pos, whence, pos);
|
||
return err ? __hurd_fail (err) : 0;
|
||
}
|
||
|
||
/* Close the file associated with COOKIE.
|
||
Return 0 for success or -1 for failure. */
|
||
static int
|
||
closeio (void *cookie)
|
||
{
|
||
error_t error = __mach_port_deallocate (__mach_task_self (),
|
||
(mach_port_t) cookie);
|
||
if (error)
|
||
return __hurd_fail (error);
|
||
return 0;
|
||
}
|
||
|
||
#include "../libio/libioP.h"
|
||
#define fopencookie _IO_fopencookie
|
||
static const cookie_io_functions_t funcsio =
|
||
{ readio, writeio, seekio, closeio };
|
||
|
||
|
||
/* Open a stream on PORT. MODE is as for fopen. */
|
||
|
||
FILE *
|
||
__fopenport (mach_port_t port, const char *mode)
|
||
{
|
||
int pflags;
|
||
int needflags;
|
||
error_t err;
|
||
|
||
const char *m = mode;
|
||
|
||
switch (*m++)
|
||
{
|
||
case 'r':
|
||
needflags = O_READ;
|
||
break;
|
||
case 'w':
|
||
needflags = O_WRITE;
|
||
break;
|
||
case 'a':
|
||
needflags = O_WRITE|O_APPEND;
|
||
break;
|
||
default:
|
||
return NULL;
|
||
}
|
||
if (m[0] == '+' || (m[0] == 'b' && m[1] == '+'))
|
||
needflags |= O_RDWR;
|
||
|
||
/* Verify the PORT is valid allows the access MODE specifies. */
|
||
|
||
if (err = __io_get_openmodes (port, &pflags))
|
||
return __hurd_fail (err), NULL;
|
||
|
||
/* Check the access mode. */
|
||
if ((pflags & needflags) != needflags)
|
||
{
|
||
errno = EBADF;
|
||
return NULL;
|
||
}
|
||
|
||
return fopencookie ((void *) port, mode, funcsio);
|
||
}
|
||
weak_alias (__fopenport, fopenport)
|