drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fhandler_floppy.cc (fhandler_dev_floppy::lseek): Set buf size to 

sector size.  Simplify non-sector aligned case.  Handle errors from
	raw_read.
This commit is contained in:
Corinna Vinschen 2007-05-21 09:11:27 +00:00
parent 2c656a51c9
commit b7a37e8d7c
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2007-05-21 Christian Franke <franke@computer.org>
Corinna Vinschen <corinna@vinschen.de>
* fhandler_floppy.cc (fhandler_dev_floppy::lseek): Set buf size to
sector size. Simplify non-sector aligned case. Handle errors from
raw_read.
2007-05-15 Corinna Vinschen <corinna@vinschen.de> 2007-05-15 Corinna Vinschen <corinna@vinschen.de>
* fhandler_socket.cc (adjust_socket_file_mode): New inline function. * fhandler_socket.cc (adjust_socket_file_mode): New inline function.

10
winsup/cygwin/fhandler_floppy.cc
View File

@ -408,10 +408,10 @@ fhandler_dev_floppy::raw_write (const void *ptr, size_t len)
_off64_t _off64_t
fhandler_dev_floppy::lseek (_off64_t offset, int whence) fhandler_dev_floppy::lseek (_off64_t offset, int whence)
{ {
char buf[512]; char buf[bytes_per_sector];
_off64_t lloffset = offset; _off64_t lloffset = offset;
LARGE_INTEGER sector_aligned_offset; LARGE_INTEGER sector_aligned_offset;
_off64_t bytes_left; size_t bytes_left;
if (whence == SEEK_END) if (whence == SEEK_END)
{ {
@ -453,9 +453,11 @@ fhandler_dev_floppy::lseek (_off64_t offset, int whence)
if (bytes_left) if (bytes_left)
{ {
size_t len = bytes_left; raw_read (buf, bytes_left);
raw_read (buf, len); if (bytes_left == (size_t) -1)
return -1;
} }
return sector_aligned_offset.QuadPart + bytes_left; return sector_aligned_offset.QuadPart + bytes_left;
} }