From 11799e4168a3ef36af3cb7ffb4f5cfaed7e244d7 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 7 Apr 2009 06:20:59 +0000 Subject: Updated to fedora-glibc-20090407T0545 --- misc/Makefile | 2 +- misc/Versions | 3 ++ misc/preadv.c | 41 ++++++++++++++++++++++++++++ misc/preadv64.c | 41 ++++++++++++++++++++++++++++ misc/pwritev.c | 41 ++++++++++++++++++++++++++++ misc/pwritev64.c | 41 ++++++++++++++++++++++++++++ misc/sys/uio.h | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 7 files changed, 244 insertions(+), 8 deletions(-) create mode 100644 misc/preadv.c create mode 100644 misc/preadv64.c create mode 100644 misc/pwritev.c create mode 100644 misc/pwritev64.c (limited to 'misc') diff --git a/misc/Makefile b/misc/Makefile index a256068c2b..13576347b9 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -34,7 +34,7 @@ headers := sys/uio.h bits/uio.h sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \ bits/syslog.h bits/syslog-ldbl.h bits/syslog-path.h bits/error.h routines := brk sbrk sstk ioctl \ - readv writev \ + readv writev preadv preadv64 pwritev pwritev64 \ setreuid setregid \ seteuid setegid \ getpagesize \ diff --git a/misc/Versions b/misc/Versions index b182f12311..c930eea944 100644 --- a/misc/Versions +++ b/misc/Versions @@ -137,4 +137,7 @@ libc { GLIBC_2.7 { mkostemp; mkostemp64; } + GLIBC_2.10 { + preadv; preadv64; pwritev; pwritev64; + } } diff --git a/misc/preadv.c b/misc/preadv.c new file mode 100644 index 0000000000..3e2cc689e6 --- /dev/null +++ b/misc/preadv.c @@ -0,0 +1,41 @@ +/* Copyright (C) 2009 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. */ + +#include +#include +#include + +/* Read data from file descriptor FD at the given position OFFSET + without change the file pointer, 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 ) except that data are put in VECTOR instead + of a contiguous buffer. */ +ssize_t +preadv (fd, vector, count, offset) + int fd; + const struct iovec *vector; + int count; + off_t offset; +{ + __set_errno (ENOSYS); + return -1; +} + +stub_warning (preadv) +#include diff --git a/misc/preadv64.c b/misc/preadv64.c new file mode 100644 index 0000000000..ea675bb359 --- /dev/null +++ b/misc/preadv64.c @@ -0,0 +1,41 @@ +/* Copyright (C) 2009 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. */ + +#include +#include +#include + +/* Read data from file descriptor FD at the given position OFFSET + without change the file pointer, 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 ) except that data are put in VECTOR instead + of a contiguous buffer. */ +ssize_t +preadv64 (fd, vector, count, offset) + int fd; + const struct iovec *vector; + int count; + off64_t offset; +{ + __set_errno (ENOSYS); + return -1; +} + +stub_warning (preadv64) +#include diff --git a/misc/pwritev.c b/misc/pwritev.c new file mode 100644 index 0000000000..d45ed23351 --- /dev/null +++ b/misc/pwritev.c @@ -0,0 +1,41 @@ +/* Copyright (C) 2009 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. */ + +#include +#include +#include + +/* Write data pointed by the buffers described by VECTOR, which is a + vector of COUNT 'struct iovec's, to file descriptor FD at the given + position OFFSET without change the file pointer. The data is + written in the order specified. Operates just like 'write' (see + ) except that the data are taken from VECTOR instead of a + contiguous buffer. */ +ssize_t +pwritev (fd, vector, count, offset) + int fd; + const struct iovec *vector; + int count; + off_t offset; +{ + __set_errno (ENOSYS); + return -1; +} + +stub_warning (pwritev) +#include diff --git a/misc/pwritev64.c b/misc/pwritev64.c new file mode 100644 index 0000000000..fe95857554 --- /dev/null +++ b/misc/pwritev64.c @@ -0,0 +1,41 @@ +/* Copyright (C) 2009 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. */ + +#include +#include +#include + +/* Write data pointed by the buffers described by VECTOR, which is a + vector of COUNT 'struct iovec's, to file descriptor FD at the given + position OFFSET without change the file pointer. The data is + written in the order specified. Operates just like 'write' (see + ) except that the data are taken from VECTOR instead of a + contiguous buffer. */ +ssize_t +pwritev64 (fd, vector, count, offset) + int fd; + const struct iovec *vector; + int count; + off64_t offset; +{ + __set_errno (ENOSYS); + return -1; +} + +stub_warning (pwritev64) +#include diff --git a/misc/sys/uio.h b/misc/sys/uio.h index 1b203f71c2..a3c782917a 100644 --- a/misc/sys/uio.h +++ b/misc/sys/uio.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 96, 97, 98, 99, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1991,1992,1996-1999,2003,2009 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 @@ -30,24 +30,93 @@ __BEGIN_DECLS /* Read data from file descriptor FD, and put the result in the - buffers described by IOVEC, which is a vector of COUNT `struct iovec's. + buffers described by IOVEC, which is a vector of COUNT 'struct iovec's. The buffers are filled in the order specified. - Operates just like `read' (see ) except that data are + Operates just like 'read' (see ) except that data are put in IOVEC instead of a contiguous buffer. This function is a cancellation point and therefore not marked with __THROW. */ -extern ssize_t readv (int __fd, __const struct iovec *__iovec, int __count); +extern ssize_t readv (int __fd, __const struct iovec *__iovec, int __count) + __wur; /* Write data pointed by the buffers described by IOVEC, which - is a vector of COUNT `struct iovec's, to file descriptor FD. + is a vector of COUNT 'struct iovec's, to file descriptor FD. The data is written in the order specified. - Operates just like `write' (see ) except that the data + Operates just like 'write' (see ) except that the data are taken from IOVEC instead of a contiguous buffer. This function is a cancellation point and therefore not marked with __THROW. */ -extern ssize_t writev (int __fd, __const struct iovec *__iovec, int __count); +extern ssize_t writev (int __fd, __const struct iovec *__iovec, int __count) + __wur; + + +#ifdef __USE_BSD +# ifndef __USE_FILE_OFFSET64 +/* Read data from file descriptor FD at the given position OFFSET + without change the file pointer, and put the result in the buffers + described by IOVEC, which is a vector of COUNT 'struct iovec's. + The buffers are filled in the order specified. Operates just like + 'read' (see ) except that data are put in IOVEC instead + of a contiguous buffer. + + This function is a cancellation point and therefore not marked with + __THROW. */ +extern ssize_t preadv (int __fd, __const struct iovec *__iovec, int __count, + __off_t __offset) __wur; + +/* Write data pointed by the buffers described by IOVEC, which is a + vector of COUNT 'struct iovec's, to file descriptor FD at the given + position OFFSET without change the file pointer. The data is + written in the order specified. Operates just like 'write' (see + ) except that the data are taken from IOVEC instead of a + contiguous buffer. + + This function is a cancellation point and therefore not marked with + __THROW. */ +extern ssize_t pwritev (int __fd, __const struct iovec *__iovec, int __count, + __off_t __offset) __wur; +# else +# ifdef __REDIRECT +extern ssize_t __REDIRECT (preadv, (int __fd, __const struct iovec *__iovec, + int __count, __off_t __offset), + preadv64) __wur; +extern ssize_t __REDIRECT (pwritev, (int __fd, __const struct iovec *__iovec, + int __count, __off_t __offset), + pwritev64) __wur; +# else +# define preadv preadv64 +# define pwritev pwritev64 +# endif +# endif + +# ifdef __USE_LARGEFILE64 +/* Read data from file descriptor FD at the given position OFFSET + without change the file pointer, and put the result in the buffers + described by IOVEC, which is a vector of COUNT 'struct iovec's. + The buffers are filled in the order specified. Operates just like + 'read' (see ) except that data are put in IOVEC instead + of a contiguous buffer. + + This function is a cancellation point and therefore not marked with + __THROW. */ +extern ssize_t preadv64 (int __fd, __const struct iovec *__iovec, int __count, + __off64_t __offset) __wur; + +/* Write data pointed by the buffers described by IOVEC, which is a + vector of COUNT 'struct iovec's, to file descriptor FD at the given + position OFFSET without change the file pointer. The data is + written in the order specified. Operates just like 'write' (see + ) except that the data are taken from IOVEC instead of a + contiguous buffer. + + This function is a cancellation point and therefore not marked with + __THROW. */ +extern ssize_t pwritev64 (int __fd, __const struct iovec *__iovec, int __count, + __off64_t __offset) __wur; +# endif +#endif /* Use BSD */ __END_DECLS -- cgit v1.2.3