mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-25 12:11:10 +00:00
e19c95fd5e
Continuing the removal of __libc_* function names that are no longer used anywhere, this patch removes the __libc_readv and __libc_writev names. Tested for x86_64 that stripped installed shared libraries are unchanged by the patch. * include/sys/uio.h (__libc_readv): Remove declaration. (__libc_writev): Likewise. * misc/readv.c (__libc_readv): Rename to __readv. (__readv): Do not define as alias. (readv): Define as alias of __readv. * misc/writev.c (__libc_writev): Rename to __writev. (__writev): Do not define as alias. (writev): Define as alias of __writev. * sysdeps/posix/readv.c (__libc_readv): Rename to __readv. (__readv): Do not define as alias. (readv): Define unconditionally as alias of __readv. * sysdeps/posix/writev.c (__libc_writev): Rename to __writev. (__writev): Do not define as alias. (writev): Define unconditionally as alias of __writev. * sysdeps/unix/syscalls.list (readv): Do not define __libc_readv name. (writev): Do not define __libc_writev name.
92 lines
2.6 KiB
C
92 lines
2.6 KiB
C
/* Copyright (C) 1991-2014 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 <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
#include <limits.h>
|
|
#include <stdbool.h>
|
|
#include <sys/param.h>
|
|
#include <sys/uio.h>
|
|
#include <errno.h>
|
|
|
|
|
|
static void
|
|
ifree (char **ptrp)
|
|
{
|
|
free (*ptrp);
|
|
}
|
|
|
|
/* Read data from file descriptor FD, and put the result in the
|
|
buffers described by VECTOR, which is a vector of COUNT 'struct iovec's.
|
|
The buffers are filled in the order specified.
|
|
Operates just like 'read' (see <unistd.h>) except that data are
|
|
put in VECTOR instead of a contiguous buffer. */
|
|
ssize_t
|
|
__readv (int fd, const struct iovec *vector, int count)
|
|
{
|
|
/* Find the total number of bytes to be read. */
|
|
size_t bytes = 0;
|
|
for (int i = 0; i < count; ++i)
|
|
{
|
|
/* Check for ssize_t overflow. */
|
|
if (SSIZE_MAX - bytes < vector[i].iov_len)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return -1;
|
|
}
|
|
bytes += vector[i].iov_len;
|
|
}
|
|
|
|
/* Allocate a temporary buffer to hold the data. We should normally
|
|
use alloca since it's faster and does not require synchronization
|
|
with other threads. But we cannot if the amount of memory
|
|
required is too large. */
|
|
char *buffer;
|
|
char *malloced_buffer __attribute__ ((__cleanup__ (ifree))) = NULL;
|
|
if (__libc_use_alloca (bytes))
|
|
buffer = (char *) __alloca (bytes);
|
|
else
|
|
{
|
|
malloced_buffer = buffer = (char *) malloc (bytes);
|
|
if (buffer == NULL)
|
|
return -1;
|
|
}
|
|
|
|
/* Read the data. */
|
|
ssize_t bytes_read = __read (fd, buffer, bytes);
|
|
if (bytes_read < 0)
|
|
return -1;
|
|
|
|
/* Copy the data from BUFFER into the memory specified by VECTOR. */
|
|
bytes = bytes_read;
|
|
for (int i = 0; i < count; ++i)
|
|
{
|
|
size_t copy = MIN (vector[i].iov_len, bytes);
|
|
|
|
(void) memcpy ((void *) vector[i].iov_base, (void *) buffer, copy);
|
|
|
|
buffer += copy;
|
|
bytes -= copy;
|
|
if (bytes == 0)
|
|
break;
|
|
}
|
|
|
|
return bytes_read;
|
|
}
|
|
weak_alias (__readv, readv)
|