From b7a37e8d7cb7cbd6fc650b9b1c538a5e87032f0b Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 21 May 2007 09:11:27 +0000 Subject: * fhandler_floppy.cc (fhandler_dev_floppy::lseek): Set buf size to sector size. Simplify non-sector aligned case. Handle errors from raw_read. --- winsup/cygwin/fhandler_floppy.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'winsup/cygwin/fhandler_floppy.cc') diff --git a/winsup/cygwin/fhandler_floppy.cc b/winsup/cygwin/fhandler_floppy.cc index c4ebcc0ff..ee8d56b57 100644 --- a/winsup/cygwin/fhandler_floppy.cc +++ b/winsup/cygwin/fhandler_floppy.cc @@ -408,10 +408,10 @@ fhandler_dev_floppy::raw_write (const void *ptr, size_t len) _off64_t fhandler_dev_floppy::lseek (_off64_t offset, int whence) { - char buf[512]; + char buf[bytes_per_sector]; _off64_t lloffset = offset; LARGE_INTEGER sector_aligned_offset; - _off64_t bytes_left; + size_t bytes_left; if (whence == SEEK_END) { @@ -453,9 +453,11 @@ fhandler_dev_floppy::lseek (_off64_t offset, int whence) if (bytes_left) { - size_t len = bytes_left; - raw_read (buf, len); + raw_read (buf, bytes_left); + if (bytes_left == (size_t) -1) + return -1; } + return sector_aligned_offset.QuadPart + bytes_left; } -- cgit v1.2.3