X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libatalk%2Fadouble%2Fad_sendfile.c;h=2730644b69adc1669868fe5d3da4bb6b4cd1971e;hb=371efee757ed56fd9e2f46b39fae625924d2cfc2;hp=1803d71e564ffd9e933b97f83ec868faf8125f18;hpb=3bd0074ed1b42f4f4d3a9c94b263d9c101c6bb0b;p=netatalk.git

diff --git a/libatalk/adouble/ad_sendfile.c b/libatalk/adouble/ad_sendfile.c
index 1803d71e..2730644b 100644
--- a/libatalk/adouble/ad_sendfile.c
+++ b/libatalk/adouble/ad_sendfile.c
@@ -1,99 +1,106 @@
 /*
- * $Id: ad_sendfile.c,v 1.7 2003-06-06 20:43:14 srittau 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(HAVE_SENDFILE_READ) || defined(HAVE_SENDFILE_WRITE)
-static __inline__ int ad_sendfile_init(const struct adouble *ad, 
-				       const int eid, off_t *off,
-				       const int end)
+#if defined(SENDFILE_FLAVOR_LINUX)
+#include <sys/sendfile.h>
+
+ssize_t sys_sendfile(int tofd, int fromfd, off_t *offset, size_t count)
 {
-  int fd;
+    return sendfile(tofd, fromfd, offset, count);
+}
 
-  if (end) 
-    *off = ad_size(ad, eid) - *off;
+#elif defined(SENDFILE_FLAVOR_SOLARIS)
+#include <sys/sendfile.h>
 
-  if (eid == ADEID_DFORK) {
-    fd = ad_dfileno(ad);
-  } else {
-    *off += ad_getentryoff(ad, eid);
-    fd = ad_hfileno(ad);
-  }
-
-  return fd;
+ssize_t sys_sendfile(int tofd, int fromfd, off_t *offset, size_t count)
+{
+    return sendfile(tofd, fromfd, offset, count);
 }
-#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)
+#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)
 {
-  off_t cc;
-  int fd;
+    off_t len;
+    int ret;
 
-  fd = ad_sendfile_init(ad, eid, &off, 0);
-#ifdef __linux__
-  cc = sendfile(sock, fd, &off, len);
-#endif /* __linux__ */
+    ret = sendfile(fromfd, tofd, *offset, count, NULL, &len, 0);
 
-#ifdef BSD4_4
-  if (sendfile(fd, sock, off, len, NULL, &cc, 0) < 0)
-    return -1;
-#endif /* BSD4_4 */
+    *offset += len;
 
-  return cc;
+    if (ret != 0)
+        return -1;
+    return len;
 }
-#endif /* HAVE_SENDFILE_READ */
-
-#if 0
-#ifdef HAVE_SENDFILE_WRITE
-/* read from a socket and write to an adouble file */
-ssize_t ad_writefile(struct adouble *ad, const int eid, 
-		     const int sock, off_t off, const int end,
-		     const size_t len)
+
+#else
+
+ssize_t sys_sendfile(int out_fd, int in_fd, off_t *_offset, size_t count)
+{
+    /* No sendfile syscall. */
+    errno = ENOSYS;
+    return -1;
+}
+#endif
+
+/* ------------------------------- */
+int ad_readfile_init(const struct adouble *ad, 
+				       const int eid, off_t *off,
+				       const int end)
 {
-#ifdef __linux__
-  ssize_t cc;
   int fd;
 
-  fd = ad_sendfile_init(ad, eid, &off, end);
-  if ((cc = sendfile(fd, sock, &off, len)) < 0)
-    return -1;
+  if (end) 
+    *off = ad_size(ad, eid) - *off;
 
-  if ((eid != ADEID_DFORK) && (off > ad_getentrylen(ad, eid))) 
-    ad_setentrylen(ad, eid, off);
+  if (eid == ADEID_DFORK) {
+    fd = ad_data_fileno(ad);
+  } else {
+    *off += ad_getentryoff(ad, eid);
+    fd = ad_reso_fileno(ad);
+  }
 
-  return cc;
-#endif /* __linux__ */
+  return fd;
 }
-#endif /* HAVE_SENDFILE_WRITE */
-#endif /* 0 */
+#endif