diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2008-08-09 11:09:02 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2008-08-09 11:09:02 +0000 |
| commit | 36f17b4b40f54057401a10c8fba2a685b5f4537f (patch) | |
| tree | 1269f06b6b3cd1480d78975cff93f41f1c4558dd | |
| parent | a15b3bdef74efc01440036ab4869854f1bfff7a2 (diff) | |
| download | cygnal-36f17b4b40f54057401a10c8fba2a685b5f4537f.tar.gz cygnal-36f17b4b40f54057401a10c8fba2a685b5f4537f.tar.bz2 cygnal-36f17b4b40f54057401a10c8fba2a685b5f4537f.zip | |
* fhandler_floppy.cc (fhandler_dev_floppy::raw_read): Don't set
eom_detected when EOF is detected, thus returning 0 instead of
setting errno to ENOSPC.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_floppy.cc | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 7381e3d5a..4527099c7 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2008-08-09 Corinna Vinschen <corinna@vinschen.de> + + * fhandler_floppy.cc (fhandler_dev_floppy::raw_read): Don't set + eom_detected when EOF is detected, thus returning 0 instead of + setting errno to ENOSPC. + 2008-08-07 Corinna Vinschen <corinna@vinschen.de> * fhandler.cc (fhandler_base::open): Use Samba workaround generally diff --git a/winsup/cygwin/fhandler_floppy.cc b/winsup/cygwin/fhandler_floppy.cc index 48f901014..f0e19c952 100644 --- a/winsup/cygwin/fhandler_floppy.cc +++ b/winsup/cygwin/fhandler_floppy.cc @@ -296,10 +296,7 @@ fhandler_dev_floppy::raw_read (void *ptr, size_t& ulen) if (current_position + bytes_to_read >= drive_size) bytes_to_read = drive_size - current_position; if (!bytes_to_read) - { - eom_detected (true); - break; - } + break; debug_printf ("read %d bytes %s", bytes_to_read, len < devbufsiz ? "into buffer" : "directly"); |