1 diff -urN proftpd-1.2.10/include/data.h proftpd-1.2.10-sendfile64/include/data.h
2 --- proftpd-1.2.10/include/data.h 2004-05-21 19:19:02.000000000 +0200
3 +++ proftpd-1.2.10-sendfile64/include/data.h 2005-02-03 17:18:39.676660624 +0100
5 int pr_data_open(char *, char *, int, off_t);
6 void pr_data_close(int);
7 void pr_data_abort(int, int);
8 -int pr_data_xfer(char *, int);
9 +off_t pr_data_xfer(char *, int);
10 void pr_data_reset(void);
11 void pr_data_set_linger(long);
16 -#if defined(HAVE_AIX_SENDFILE) || defined(HAVE_HPUX_SENDFILE) || \
17 - defined(HAVE_LINUX_SENDFILE) || defined(HAVE_SOLARIS_SENDFILE)
19 -#elif defined(HAVE_BSD_SENDFILE)
22 -#error "You have an unknown sendfile implementation."
27 -pr_sendfile_t pr_data_sendfile(int retr_fd, off_t *offset, size_t count);
28 +off_t pr_data_sendfile(int retr_fd, off_t *offset, off_t count);
29 #endif /* HAVE_SENDFILE */
31 #endif /* PR_DATACONN_H */
32 diff -urN proftpd-1.2.10/modules/mod_xfer.c proftpd-1.2.10-sendfile64/modules/mod_xfer.c
33 --- proftpd-1.2.10/modules/mod_xfer.c 2004-08-25 00:24:18.000000000 +0200
34 +++ proftpd-1.2.10-sendfile64/modules/mod_xfer.c 2005-02-03 17:18:26.109723112 +0100
39 -static int _transmit_normal(char *buf, long bufsize) {
40 +static off_t _transmit_normal(char *buf, long bufsize) {
43 if ((count = pr_fsio_read(retr_fh, buf, bufsize)) <= 0)
47 static int _transmit_sendfile(off_t count, off_t *offset,
48 - pr_sendfile_t *retval) {
51 /* We don't use sendfile() if:
52 * - We're using bandwidth throttling.
55 #endif /* HAVE_SENDFILE */
57 -static long _transmit_data(off_t count, off_t offset, char *buf, long bufsize) {
59 +static off_t _transmit_data(off_t count, off_t offset, char *buf, long bufsize) {
68 - pr_sendfile_t retval;
70 #endif /* HAVE_SENDFILE */
74 if (!_transmit_sendfile(count, &offset, &retval))
75 res = _transmit_normal(buf, bufsize);
77 - res = (long) retval;
80 res = _transmit_normal(buf, bufsize);
81 #endif /* HAVE_SENDFILE */
83 off_t nbytes_max_retrieve = 0;
84 unsigned char have_limit = FALSE;
86 - long bufsize, len = 0;
87 - off_t respos = 0, nbytes_sent = 0, cnt_steps = 0, cnt_next = 0;
89 + off_t respos = 0, nbytes_sent = 0, cnt_steps = 0, cnt_next = 0, len = 0;
91 /* This function sets static module variables for later potential
92 * throttling of the transfer.
93 diff -urN proftpd-1.2.10/src/data.c proftpd-1.2.10-sendfile64/src/data.c
94 --- proftpd-1.2.10/src/data.c 2004-08-25 20:08:46.000000000 +0200
95 +++ proftpd-1.2.10-sendfile64/src/data.c 2005-02-03 17:20:56.858805768 +0100
97 * closes, or -1 if error
100 -int pr_data_xfer(char *cl_buf, int cl_size) {
103 +off_t pr_data_xfer(char *cl_buf, int cl_size) {
107 if (session.xfer.direction == PR_NETIO_IO_RD) {
108 char *buf = session.xfer.buf;
110 * ASCII translation is not performed.
111 * return 0 if reading and data connection closes, or -1 if error
113 -pr_sendfile_t pr_data_sendfile(int retr_fd, off_t *offset, size_t count) {
114 +off_t pr_data_sendfile(int retr_fd, off_t *offset, off_t count) {
116 - pr_sendfile_t len = 0, total = 0;
117 + off_t len = 0, total = 0;
118 #if defined(HAVE_AIX_SENDFILE)
119 struct sf_parms parms;
121 @@ -932,14 +932,19 @@
123 #if defined(HAVE_LINUX_SENDFILE) || defined(HAVE_SOLARIS_SENDFILE)
124 off_t orig_offset = *offset;
125 + off_t translen = 0;
127 + if (count > 1024*1024*1024)
128 + translen = 1024*1024*1024;
131 /* Linux semantics are fairly straightforward in a glibc 2.x world:
133 * #include <sys/sendfile.h>
135 * ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count)
137 - len = sendfile(PR_NETIO_FD(session.d->outstrm), retr_fd, offset, count);
138 + len = sendfile(PR_NETIO_FD(session.d->outstrm), retr_fd, offset, (size_t)translen);
140 if (len != -1 && len < count) {
141 /* under linux semantics, this occurs when a signal has interrupted