Fix broken sendfile on FreeBSD, from Denis Ahrens

diff --git a/NEWS b/NEWS
index 2ad321a05a207e58fa40adec2765f5364ab1915d..88d44f7643e30d853024e585fd6691d22f683f9d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Changes in 2.2.3
 * UPD: based on Unicode 6.1.0
 * UPD: experimental systemd service files: always run both afpd and cnid_metad
 * UPD: afpd: Ensure our umask is not altered by eg pam_umask
+* FIX: afpd: sendfile() on FreeBSD was broken, courtesy of Denis Ahrens
 
 Changes in 2.2.2
 ================

diff --git a/libatalk/adouble/ad_sendfile.c b/libatalk/adouble/ad_sendfile.c
index aabb61ce106eff5f80e69d09ab06149facbfdb51..0e7b27835e69bc3f6dd3de803a07c091f3be2a46 100644 (file)
--- a/libatalk/adouble/ad_sendfile.c
+++ b/libatalk/adouble/ad_sendfile.c
@@ -67,7 +67,16 @@ ssize_t sys_sendfile(int tofd, int fromfd, off_t *offset, size_t count)
 #include <sys/uio.h>
 ssize_t sys_sendfile(int tofd, int fromfd, off_t *offset, size_t count)
 {
-  return sendfile(fromfd, tofd, *offset, count, NULL, offset, 0);
+    off_t len;
+    int ret;
+
+    ret = sendfile(fromfd, tofd, *offset, count, NULL, &len, 0);
+
+    *offset += len;
+
+    if (ret != 0)
+        return -1;
+    return len;
 }
 
 #else