From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 88B5638930F7; Fri, 24 Apr 2020 14:23:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 88B5638930F7 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: raw disk I/O: lock floppys as well X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: b8349218955ffbb2b573a2de8efac61a800f4eb0 X-Git-Newrev: 39a1c3c96f0ac58f27a8db859228868342d05fed Message-Id: <20200424142340.88B5638930F7@sourceware.org> Date: Fri, 24 Apr 2020 14:23:40 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Apr 2020 14:23:40 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=39a1c3c96f0ac58f27a8db859228868342d05fed commit 39a1c3c96f0ac58f27a8db859228868342d05fed Author: Corinna Vinschen Date: Fri Apr 24 16:22:26 2020 +0200 Cygwin: raw disk I/O: lock floppys as well The workaround to access the full disk required since Vista and described in http://support.microsoft.com/kb/942448 (NOT ACCESSIBLE at the time of writing this commit message) is required on floppy drives as well. Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/fhandler_floppy.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/fhandler_floppy.cc b/winsup/cygwin/fhandler_floppy.cc index 778d6ef98..2768a9cbf 100644 --- a/winsup/cygwin/fhandler_floppy.cc +++ b/winsup/cygwin/fhandler_floppy.cc @@ -161,7 +161,8 @@ fhandler_dev_floppy::lock_partition (DWORD to_write) If there's some file handle open on one of the affected partitions, this fails, but that's how it works... The high partition major numbers don't have a partition 0. */ - if (get_major () >= DEV_SD_HIGHPART_START || get_minor () % 16 != 0) + if (get_major () == DEV_FLOPPY_MAJOR + || get_major () >= DEV_SD_HIGHPART_START || get_minor () % 16 != 0) { if (!DeviceIoControl (get_handle (), FSCTL_LOCK_VOLUME, NULL, 0, NULL, 0, &bytes_read, NULL)) @@ -302,7 +303,6 @@ fhandler_dev_floppy::write_file (const void *buf, DWORD to_write, See http://support.microsoft.com/kb/942448 for details. What we do here is to lock the affected partition(s) and retry. */ if (*err == ERROR_ACCESS_DENIED - && get_major () != DEV_FLOPPY_MAJOR && get_major () != DEV_CDROM_MAJOR && (get_flags () & O_ACCMODE) != O_RDONLY && lock_partition (to_write))