d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug in calculation of amount of file to send when nbytes !=0 and

Browse Source 
headers or trailers are supplied. Reported by Vladislav Shabanov
<vs@rambler-co.ru>.

PR:		33771
Submitted by:	Maxim Konovalov <maxim@macomnet.ru>
MFC after:	3 days
This commit is contained in:
David Greenman 2002-01-22 17:32:10 +00:00
parent fc50a44458
commit 7228268aaa
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=89662
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/uipc_syscalls.c
View File

@ -1651,11 +1651,13 @@ sendfile(struct thread *td, struct sendfile_args *uap)
struct vm_page *pg;
struct writev_args nuap;
struct sf_hdtr hdtr;
off_t off, xfsize, sbytes = 0;
off_t off, xfsize, hdtr_size, sbytes = 0;
int error, s;
mtx_lock(&Giant);
hdtr_size = 0;
/*
* The descriptor must be a regular file and have a backing VM object.
*/
@ -1698,7 +1700,7 @@ sendfile(struct thread *td, struct sendfile_args *uap)
error = writev(td, &nuap);
if (error)
goto done;
sbytes += td->td_retval[0];
hdtr_size += td->td_retval[0];
}
}
@ -1934,7 +1936,7 @@ sendfile(struct thread *td, struct sendfile_args *uap)
error = writev(td, &nuap);
if (error)
goto done;
sbytes += td->td_retval[0];
hdtr_size += td->td_retval[0];
}
done:
@ -1946,6 +1948,7 @@ sendfile(struct thread *td, struct sendfile_args *uap)
td->td_retval[0] = 0;
}
if (uap->sbytes != NULL) {
sbytes += hdtr_size;
copyout(&sbytes, uap->sbytes, sizeof(off_t));
}
if (vp)