Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugzilla bug #64471: need to use the value of the 'xferred' argument when

Browse Source 
sendfilev fails with EAGAIN/EWOULDBLOCK.
This commit is contained in:
wtc%netscape.com 2001-01-11 05:17:52 +00:00
parent 95302b189a
commit 1be1cd1ff7
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nsprpub/pr/src/pthreads/ptio.c
View File

@ -1008,17 +1008,20 @@ static PRBool pt_solaris_sendfile_cont(pt_Continuation *op, PRInt16 revents)
ssize_t count;
count = SOLARIS_SENDFILEV(op->arg1.osfd, vec, op->arg3.amount, &xferred);
PR_ASSERT(count <= op->nbytes_to_send);
PR_ASSERT((count == -1) || (count == xferred));
PR_ASSERT(xferred <= op->nbytes_to_send);
op->syserrno = errno;
if (count != -1) {
op->result.code += count;
} else if (op->syserrno != EWOULDBLOCK && op->syserrno != EAGAIN) {
op->result.code = -1;
} else {
return PR_FALSE;
if (count == -1) {
if (op->syserrno != EWOULDBLOCK && op->syserrno != EAGAIN) {
op->result.code = -1;
return PR_TRUE;
}
count = xferred;
}
if (count != -1 && count < op->nbytes_to_send) {
op->result.code += count;
if (count < op->nbytes_to_send) {
op->nbytes_to_send -= count;
while (count >= vec->sfv_len) {
@ -2252,10 +2255,9 @@ static PRInt32 pt_SolarisSendFile(PRFileDesc *sd, PRSendFileData *sfd,
if (count == -1) {
syserrno = errno;
if (syserrno == EINTR) {
if (syserrno == EINTR
|| syserrno == EAGAIN || syserrno == EWOULDBLOCK) {
count = xferred;
} else if (syserrno == EAGAIN || syserrno == EWOULDBLOCK) {
count = 0;
}
}