mirror
/
libowfat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

duh!!! Typo prevented iob_send from using FreeBSD sendfile

Browse Source
master
leitner 21 years ago
parent e2bb0ee39c
commit ba849a2720
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File

7
io/iob_send.c
Unescape Escape View File

@ -18,7 +18,7 @@ int64 iob_send(int64 s,io_batch* b) {
int64 total,sent; int64 total,sent;
long i; long i;
long headers; long headers;
#ifdef HAVEBSDSENDFILE #ifdef HAVE_BSDSENDFILE
long trailers; long trailers;
#endif #endif
@ -29,7 +29,7 @@ int64 iob_send(int64 s,io_batch* b) {
for (;;) { for (;;) {
if (!(e=array_get(&b->b,sizeof(iob_entry),b->next))) if (!(e=array_get(&b->b,sizeof(iob_entry),b->next)))
return -3; /* can't happen error */ return -3; /* can't happen error */
#ifdef HAVEBSDSENDFILE #ifdef HAVE_BSDSENDFILE
/* BSD sendfile can send headers and trailers. If we run on BSD, we /* BSD sendfile can send headers and trailers. If we run on BSD, we
* should try to exploit this. */ * should try to exploit this. */
headers=trailers=0; headers=trailers=0;
@ -40,7 +40,7 @@ int64 iob_send(int64 s,io_batch* b) {
v[i].iov_len=e[i].n-e[i].offset; v[i].iov_len=e[i].n-e[i].offset;
} }
headers=i; headers=i;
#ifdef HAVEBSDSENDFILE #ifdef HAVE_BSDSENDFILE
if (e[i].type==FROMFILE) { if (e[i].type==FROMFILE) {
off_t sbytes; off_t sbytes;
struct sf_hdtr hdr; struct sf_hdtr hdr;
@ -58,6 +58,7 @@ int64 iob_send(int64 s,io_batch* b) {
sent=b->bytesleft; sent=b->bytesleft;
else if (r==-1 && errno==EAGAIN) { else if (r==-1 && errno==EAGAIN) {
if ((sent=sbytes)) sent=-1; if ((sent=sbytes)) sent=-1;
sent=sbytes;
goto eagain; goto eagain;
} else } else
sent=-3; sent=-3;

Write Preview
Loading…
Cancel
Save