mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-29 08:08:37 +00:00
Code Issues Releases Activity

In send_data(), use sendfile() instead of the mmap() algorithm.

Browse Source
This commit is contained in:
Dan Moschuk 2000-12-20 03:34:54 +00:00
parent 56a7c4a852
commit f6f0c4b90d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=70205
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libexec/ftpd/ftpd.c
View File

@ -1698,9 +1698,10 @@ send_data(instr, outstr, blksize, filesize, isreg)
off_t filesize;
int isreg;
{
int c, cnt, filefd, netfd;
char *buf, *bp;
int c, filefd, netfd;
char *buf;
size_t len;
off_t cnt;
transflag++;
if (setjmp(urgcatch)) {
@ -1737,27 +1738,28 @@ send_data(instr, outstr, blksize, filesize, isreg)
netfd = fileno(outstr);
filefd = fileno(instr);
if (isreg && filesize < (off_t)16 * 1024 * 1024) {
buf = mmap(0, filesize, PROT_READ, MAP_SHARED, filefd,
(off_t)0);
if (buf == MAP_FAILED) {
syslog(LOG_WARNING, "mmap(%lu): %m",
(unsigned long)filesize);
goto oldway;
}
bp = buf;
len = filesize;
do {
cnt = write(netfd, bp, len);
len -= cnt;
bp += cnt;
if (cnt > 0) byte_count += cnt;
} while(cnt > 0 && len > 0);
if (isreg) {
off_t offset;
int err;
len = filesize;
err = cnt = offset = 0;
while (err != -1 && cnt < filesize) {
err = sendfile(filefd, netfd, offset, len,
(struct sf_hdtr *) NULL, &cnt, 0);
offset += cnt;
len -= cnt;
if (err == -1) {
if (!cnt)
goto oldway;
goto data_err;
}
}
transflag = 0;
munmap(buf, (size_t)filesize);
if (cnt < 0)
goto data_err;
reply(226, "Transfer complete.");
return;
}