Merge master

[netatalk.git] / libatalk / adouble / ad_sendfile.c

diff --git a/libatalk/adouble/ad_sendfile.c b/libatalk/adouble/ad_sendfile.c
index 35a9bccc0b0aa15b3b75ab4846d0bd7762cf5dd3..113f30c9bf0f130b122ce732c7c03f3b1c639bff 100644 (file)
--- a/libatalk/adouble/ad_sendfile.c
+++ b/libatalk/adouble/ad_sendfile.c
@@ -1,55 +1,82 @@
 /*
- * $Id: ad_sendfile.c,v 1.5 2002-10-11 14:18:38 didg Exp $
- *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
  *
  * NOTE: the following uses the fact that sendfile() only exists on
  * machines with SA_RESTART behaviour. this is all very machine specific. 
  *
- * 
+ * sendfile chainsaw from samba.
+ Unix SMB/Netbios implementation.
+ Version 2.2.x / 3.0.x
+ sendfile implementations.
+ Copyright (C) Jeremy Allison 2002.
+ 
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ This program 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 General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#ifdef WITH_SENDFILE
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
+#include <errno.h>  
 
 #include <atalk/adouble.h>
-
 #include <atalk/logger.h>
 
-#include "ad_private.h"
+#include "ad_lock.h"
+
+#if defined(SENDFILE_FLAVOR_LINUX)
+#include <sys/sendfile.h>
 
-static int _ad_sendfile_dummy;
+ssize_t sys_sendfile(int tofd, int fromfd, off_t *offset, size_t count)
+{
+    return sendfile(tofd, fromfd, offset, count);
+}
 
-#ifdef ATACC
+#elif defined(SENDFILE_FLAVOR_SOLARIS)
+#include <sys/sendfile.h>
+
+ssize_t sys_sendfile(int tofd, int fromfd, off_t *offset, size_t count)
+{
+    return sendfile(tofd, fromfd, offset, count);
+}
 
-#if defined(HAVE_SENDFILE_READ)
-#ifdef __NR_sendfile
-int sendfile(int fdout, int fdin, off_t *off, size_t count)
+#elif defined(SENDFILE_FLAVOR_BSD )
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h><
+ssize_t sys_sendfile(int tofd, int fromfd, off_t *offset, size_t count)
 {
-#if _FILE_OFFSET_BITS == 64 
-#error sendfile
-  return syscall(__NR_sendfile64, fdout, fdin, off, count);
+  return sendfile(fromfd, tofd, *offset, count, NULL, offset, 0);
+}
+
 #else
-  return syscall(__NR_sendfile, fdout, fdin, off, count);
-#endif
+
+ssize_t sys_sendfile(int out_fd, int in_fd, off_t *_offset, size_t count)
+{
+    /* No sendfile syscall. */
+    errno = ENOSYS;
+    return -1;
 }
 #endif
-#endif
-#endif
 
-#if defined(HAVE_SENDFILE_READ) || defined(HAVE_SENDFILE_WRITE)
-static __inline__ int ad_sendfile_init(const struct adouble *ad, 
+/* ------------------------------- */
+int ad_readfile_init(const struct adouble *ad, 
                                       const int eid, off_t *off,
                                       const int end)
 {
@@ -59,40 +86,17 @@ static __inline__ int ad_sendfile_init(const struct adouble *ad,
     *off = ad_size(ad, eid) - *off;
 
   if (eid == ADEID_DFORK) {
-    fd = ad_dfileno(ad);
+    fd = ad_data_fileno(ad);
   } else {
     *off += ad_getentryoff(ad, eid);
-    fd = ad_hfileno(ad);
+    fd = ad_reso_fileno(ad);
   }
 
   return fd;
 }
-#endif
-
-
-/* read from adouble file and write to socket. sendfile doesn't change
- * the file pointer position. */
-#ifdef HAVE_SENDFILE_READ
-ssize_t ad_readfile(const struct adouble *ad, const int eid, 
-                   const int sock, off_t off, const size_t len)
-{
-  off_t cc;
-  int fd;
 
-  fd = ad_sendfile_init(ad, eid, &off, 0);
-#ifdef __linux__
-  cc = sendfile(sock, fd, &off, len);
-#endif /* __linux__ */
-
-#ifdef BSD4_4
-  if (sendfile(fd, sock, off, len, NULL, &cc, 0) < 0)
-    return -1;
-#endif /* BSD4_4 */
-
-  return cc;
-}
-#endif /* HAVE_SENDFILE_READ */
 
+/* ------------------------ */
 #if 0
 #ifdef HAVE_SENDFILE_WRITE
 /* read from a socket and write to an adouble file */
@@ -105,7 +109,7 @@ ssize_t ad_writefile(struct adouble *ad, const int eid,
   int fd;
 
   fd = ad_sendfile_init(ad, eid, &off, end);
-  if ((cc = sendfile(fd, sock, &off, len)) < 0)
+  if ((cc = sys_sendfile(fd, sock, &off, len)) < 0)
     return -1;
 
   if ((eid != ADEID_DFORK) && (off > ad_getentrylen(ad, eid))) 
@@ -116,3 +120,4 @@ ssize_t ad_writefile(struct adouble *ad, const int eid,
 }
 #endif /* HAVE_SENDFILE_WRITE */
 #endif /* 0 */
+#endif