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

fix bug in mmap code path of io_sendfile (David Leadbeater)

Browse Source
This commit is contained in:
leitner 2004-03-24 14:02:00 +00:00
parent 3fd4c515ae
commit 5e2141e9f6
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -5,6 +5,7 @@
add man pages for libio, safemult add man pages for libio, safemult
fix possible signal race in io_tryread and io_trywrite (Scott Lamb) fix possible signal race in io_tryread and io_trywrite (Scott Lamb)
fix byte_rchr return value (Marcus Winkler) fix byte_rchr return value (Marcus Winkler)
fix bug in mmap code path of io_sendfile (David Leadbeater)
0.18: 0.18:
make libowfat compile on BSD again (sorry, and thanks to everyone who make libowfat compile on BSD again (sorry, and thanks to everyone who

12
io/io_sendfile.c
View File

@ -139,15 +139,25 @@ int64 io_sendfile(int64 out,int64 in,uint64 off,uint64 bytes) {
if (m==-1) { if (m==-1) {
e->canwrite=0; e->canwrite=0;
e->next_write=-1; e->next_write=-1;
return errno==EAGAIN?(sent?sent:-1):-3; if (errno!=EAGAIN) {
munmap(e->mmapped,e->maplen);
e->mmapped=0;
return -3;
}
return sent?sent:-1;
} }
if (m==0) return sent; if (m==0) return sent;
sent+=m; sent+=m;
left-=m; left-=m;
bytes-=m; bytes-=m;
off+=m; off+=m;
c+=m;
} }
} while (bytes); } while (bytes);
if (e->mmapped) {
munmap(e->mmapped,e->maplen);
e->mmapped=0;
}
return sent; return sent;
} }
readwrite: readwrite: