From 1a953df3b4e0545c5d42f656834346ec16cf2654 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Thu, 14 Nov 2002 00:55:46 +0000 Subject: Implement sendfile64 -Erik --- include/sys/sendfile.h | 31 +++++++++++++++++------ libc/sysdeps/linux/common/Makefile | 3 ++- libc/sysdeps/linux/common/sendfile64.c | 46 ++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 9 deletions(-) create mode 100644 libc/sysdeps/linux/common/sendfile64.c diff --git a/include/sys/sendfile.h b/include/sys/sendfile.h index ea474048c..797822b9f 100644 --- a/include/sys/sendfile.h +++ b/include/sys/sendfile.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc. +/* sendfile -- copy data directly from one file descriptor to another + Copyright (C) 1998,99,01,2002 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 @@ -22,16 +23,30 @@ #include #include -#ifdef __USE_FILE_OFFSET64 -# error " cannot be used with _FILE_OFFSET_BITS=64" -#endif - __BEGIN_DECLS -/* Send COUNT bytes from file associated with IN_FD starting at OFFSET to - descriptor OUT_FD. */ -extern ssize_t sendfile (int __out_fd, int __in_fd, off_t *offset, +/* Send up to COUNT bytes from file associated with IN_FD starting at + *OFFSET to descriptor OUT_FD. Set *OFFSET to the IN_FD's file position + following the read bytes. If OFFSET is a null pointer, use the normal + file position instead. Return the number of written bytes, or -1 in + case of error. */ +#ifndef __USE_FILE_OFFSET64 +extern ssize_t sendfile (int __out_fd, int __in_fd, off_t *__offset, size_t __count) __THROW; +#else +# ifdef __REDIRECT +extern ssize_t __REDIRECT (sendfile, + (int __out_fd, int __in_fd, __off64_t *__offset, + size_t __count) __THROW, + sendfile64); +# else +# define sendfile sendfile64 +# endif +#endif +#ifdef __USE_LARGEFILE64 +extern ssize_t sendfile64 (int __out_fd, int __in_fd, __off64_t *__offset, + size_t __count) __THROW; +#endif __END_DECLS diff --git a/libc/sysdeps/linux/common/Makefile b/libc/sysdeps/linux/common/Makefile index a0b140f65..f66c09f31 100644 --- a/libc/sysdeps/linux/common/Makefile +++ b/libc/sysdeps/linux/common/Makefile @@ -34,7 +34,8 @@ CSRC= waitpid.c getdnnm.c gethstnm.c getcwd.c \ wait3.c setpgrp.c getdtablesize.c create_module.c ptrace.c \ cmsg_nxthdr.c longjmp.c open64.c ftruncate64.c \ truncate64.c getrlimit64.c setrlimit64.c creat64.c mmap64.c \ - llseek.c pread_write.c _exit.c setuid.c sync.c getdirname.c + llseek.c pread_write.c _exit.c setuid.c sync.c getdirname.c \ + sendfile64.c ifneq ($(strip $(EXCLUDE_BRK)),y) CSRC+=sbrk.c endif diff --git a/libc/sysdeps/linux/common/sendfile64.c b/libc/sysdeps/linux/common/sendfile64.c new file mode 100644 index 000000000..17ba803ea --- /dev/null +++ b/libc/sysdeps/linux/common/sendfile64.c @@ -0,0 +1,46 @@ +/* + * sendfile64 syscall. Copes with 64 bit and 32 bit machines + * and on 32 bit machines this sends things into the kernel as + * two 32-bit arguments (high and low 32 bits of length) that + * are ordered based on endianess. It turns out endian.h has + * just the macro we need to order things, __LONG_LONG_PAIR. + * + * Copyright (C) 2002 Erik Andersen + * + * This file is subject to the terms and conditions of the GNU + * Lesser General Public License. See the file COPYING.LIB in + * the main directory of this archive for more details. + */ + +#include +#include +#include +#include +#include +#include +#include + + +#if __WORDSIZE == 64 +/* For a 64 bit machine, life is simple... */ +_syscall4(ssize_t,sendfile64, int, out_fd, int, in_fd, __off64_t *, offset, size_t, count) + +#elif __WORDSIZE == 32 + +#if defined __UCLIBC_HAS_LFS__ +#if defined __NR_sendfile64 +_syscall4(ssize_t,sendfile64, int, out_fd, int, in_fd, __off64_t *, offset, size_t, count) + +#else +ssize_t sendfile64 (int out_fd, int in_fd, __off64_t *offset, size_t count) +{ + __set_errno (ENOSYS); + return -1; +} +#endif + +#endif /* __UCLIBC_HAS_LFS__ */ + +#else /* __WORDSIZE */ +#error Your machine is not 64 bit or 32 bit, I am dazed and confused. +#endif -- cgit v1.2.3