Undo the work-around for the sendfile bug where nbytes needed the hdr/trl

size added to it in order for it to work properly when nbytes != 0.

Reviewed by:	alfred
MFC after:	3 days
This commit is contained in:
dg 2002-01-22 23:35:09 +00:00
parent 68bd351049
commit 4eb53f0f84

View File

@ -100,17 +100,6 @@ _sendfile(int fd, int s, off_t offset, size_t nbytes, struct sf_hdtr *hdtr,
/* Check if file operations are to block */
blocking = ((_thread_fd_table[s]->flags & O_NONBLOCK) == 0);
/*
* Emulate sendfile(2) weirdness, sendfile doesn't actually send
* nbytes of the file, it really sends (nbytes - headers_size) of
* the file. If (nbytes - headers_size) == 0 we just send trailers.
*/
if (nbytes != 0) {
nbytes -= nwritten;
if (nbytes <= 0)
goto ERROR_2;
}
/*
* Loop while no error occurs and until the expected number of bytes are
* written.