From f859ca87a7daff7e93587f239be0199e047f5608 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 29 Sep 2005 16:57:09 +0000 Subject: * fhandler_floppy.cc (fhandler_dev_floppy::get_drive_info): Don't call EX ioctls on floppy drives. --- winsup/cygwin/ChangeLog | 12 ++++++++++++ winsup/cygwin/fhandler_floppy.cc | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'winsup/cygwin') diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index ad80966ee..14d22c0ac 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,15 @@ +2005-09-29 Corinna Vinschen + + * fhandler_floppy.cc (fhandler_dev_floppy::get_drive_info): Don't call + EX ioctls on floppy drives. + +2005-09-29 Corinna Vinschen + + * dir.cc (mkdir): Check for trailing /. or /.. component. + (rmdir): Ditto. + * path.cc (has_dot_last_component): New function. + * path.h (has_dot_last_component): Add declaration. + 2005-09-29 Corinna Vinschen * crt0.cc: Remove PPC considerations. diff --git a/winsup/cygwin/fhandler_floppy.cc b/winsup/cygwin/fhandler_floppy.cc index 90209fc04..96f25b189 100644 --- a/winsup/cygwin/fhandler_floppy.cc +++ b/winsup/cygwin/fhandler_floppy.cc @@ -47,7 +47,7 @@ fhandler_dev_floppy::get_drive_info (struct hd_geometry *geo) /* Always try using the new EX ioctls first (>= XP). If not available, fall back to trying the old non-EX ioctls. */ - if (wincap.has_disk_ex_ioctls ()) + if (wincap.has_disk_ex_ioctls () && pc.dev.major != DEV_FLOPPY_MAJOR) { if (!DeviceIoControl (get_handle (), IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, -- cgit v1.2.3