summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2005-09-29 16:57:09 +0000
committerCorinna Vinschen <corinna@vinschen.de>2005-09-29 16:57:09 +0000
commitf859ca87a7daff7e93587f239be0199e047f5608 (patch)
tree13bbc32bba5bfa09d3fb67ecaa65b14e48fb9d11 /winsup/cygwin
parentf6c9ff6646a97ad4dd45ebdf755d4eb73fe5b6a5 (diff)
downloadcygnal-f859ca87a7daff7e93587f239be0199e047f5608.tar.gz
cygnal-f859ca87a7daff7e93587f239be0199e047f5608.tar.bz2
cygnal-f859ca87a7daff7e93587f239be0199e047f5608.zip
* fhandler_floppy.cc (fhandler_dev_floppy::get_drive_info): Don't call
EX ioctls on floppy drives.
Diffstat (limited to 'winsup/cygwin')
-rw-r--r--winsup/cygwin/ChangeLog12
-rw-r--r--winsup/cygwin/fhandler_floppy.cc2
2 files changed, 13 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ad80966ee..14d22c0ac 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,17 @@
2005-09-29 Corinna Vinschen <corinna@vinschen.de>
+ * fhandler_floppy.cc (fhandler_dev_floppy::get_drive_info): Don't call
+ EX ioctls on floppy drives.
+
+2005-09-29 Corinna Vinschen <corinna@vinschen.de>
+
+ * 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 <corinna@vinschen.de>
+
* crt0.cc: Remove PPC considerations.
(WinMainCRTStartup): Add symbol as alias to mainCRTStartup.
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,