libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* fhandler_floppy.cc (fhandler_floppy::lseek): Remove iswinnt check.

This commit is contained in:
Corinna Vinschen 2001-09-05 10:14:15 +00:00
parent 669153e144
commit 37c23731c7
2 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,7 @@
Wed Sep 5 12:12:00 2001 Corinna Vinschen <corinna@vinschen.de>
* fhandler_floppy.cc (fhandler_floppy::lseek): Remove iswinnt check.
Wed Sep 5 11:34:00 2001 Corinna Vinschen <corinna@vinschen.de> Wed Sep 5 11:34:00 2001 Corinna Vinschen <corinna@vinschen.de>
* fhandler_socket.cc (fhandler_socket::close): Change 2MSL value * fhandler_socket.cc (fhandler_socket::close): Change 2MSL value

69
winsup/cygwin/fhandler_floppy.cc
View File

@ -91,44 +91,41 @@ fhandler_dev_floppy::lseek (off_t offset, int whence)
DWORD low; DWORD low;
LONG high = 0; LONG high = 0;
if (iswinnt) DISK_GEOMETRY di;
{ PARTITION_INFORMATION pi;
DISK_GEOMETRY di; DWORD bytes_read;
PARTITION_INFORMATION pi;
DWORD bytes_read;
if (!DeviceIoControl (get_handle(), if (!DeviceIoControl (get_handle(),
IOCTL_DISK_GET_DRIVE_GEOMETRY, IOCTL_DISK_GET_DRIVE_GEOMETRY,
NULL, 0, NULL, 0,
&di, sizeof (di), &di, sizeof (di),
&bytes_read, NULL)) &bytes_read, NULL))
{ {
__seterrno (); __seterrno ();
return -1; return -1;
}
debug_printf ("disk geometry: (%ld cyl)*(%ld trk)*(%ld sec)*(%ld bps)",
di.Cylinders.LowPart,
di.TracksPerCylinder,
di.SectorsPerTrack,
di.BytesPerSector);
if (DeviceIoControl (get_handle (),
IOCTL_DISK_GET_PARTITION_INFO,
NULL, 0,
&pi, sizeof (pi),
&bytes_read, NULL))
{
debug_printf ("partition info: %ld (%ld)",
pi.StartingOffset.LowPart,
pi.PartitionLength.LowPart);
drive_size = (long long) pi.PartitionLength.QuadPart;
}
else
{
drive_size = (long long) di.Cylinders.QuadPart * di.TracksPerCylinder *
di.SectorsPerTrack * di.BytesPerSector;
}
debug_printf ("drive size: %ld", drive_size);
} }
debug_printf ("disk geometry: (%ld cyl)*(%ld trk)*(%ld sec)*(%ld bps)",
di.Cylinders.LowPart,
di.TracksPerCylinder,
di.SectorsPerTrack,
di.BytesPerSector);
if (DeviceIoControl (get_handle (),
IOCTL_DISK_GET_PARTITION_INFO,
NULL, 0,
&pi, sizeof (pi),
&bytes_read, NULL))
{
debug_printf ("partition info: %ld (%ld)",
pi.StartingOffset.LowPart,
pi.PartitionLength.LowPart);
drive_size = (long long) pi.PartitionLength.QuadPart;
}
else
{
drive_size = (long long) di.Cylinders.QuadPart * di.TracksPerCylinder *
di.SectorsPerTrack * di.BytesPerSector;
}
debug_printf ("drive size: %ld", drive_size);
if (whence == SEEK_END && drive_size > 0) if (whence == SEEK_END && drive_size > 0)
{ {