[PATCH 3/3] Strip trailing slashes on PHYSICALDRIVE%d paths when making Windows CreateFile calls.

Wed, 21 Sep 2011 13:49:24 -0700 

=== modified file 'ChangeLog'
--- ChangeLog    2011-09-21 20:38:06 +0000
+++ ChangeLog    2011-09-21 20:39:06 +0000
@@ -2,6 +2,8 @@

     * Remove extra declaration of sleep for mingw32.
     * No realpath on mingw32.  Instead use _fullpath.
+    * Strip trailing slashes on PHYSICALDRIVE%d paths when making
+    Windows CreateFile calls.

 2011-09-17  Grégoire Sutre <[email protected]>

=== modified file 'util/misc.c'
--- util/misc.c    2011-09-21 20:36:50 +0000
+++ util/misc.c    2011-09-21 20:39:06 +0000
@@ -55,6 +55,7 @@
 #ifdef __MINGW32__
 #include <windows.h>
 #include <winioctl.h>
+#include "dirname.h"
 #endif

 #ifdef GRUB_UTIL
@@ -322,6 +323,7 @@
   HANDLE hd;
   grub_int64_t size = -1LL;

+  strip_trailing_slashes(name);
   hd = CreateFile (name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
                    0, OPEN_EXISTING, 0, 0);




=== modified file 'ChangeLog'
--- ChangeLog	2011-09-21 20:38:06 +0000
+++ ChangeLog	2011-09-21 20:39:06 +0000
@@ -2,6 +2,8 @@
 
 	* Remove extra declaration of sleep for mingw32.
 	* No realpath on mingw32.  Instead use _fullpath.
+	* Strip trailing slashes on PHYSICALDRIVE%d paths when making
+	Windows CreateFile calls.
 
 2011-09-17  Grégoire Sutre  <[email protected]>
 

=== modified file 'util/misc.c'
--- util/misc.c	2011-09-21 20:36:50 +0000
+++ util/misc.c	2011-09-21 20:39:06 +0000
@@ -55,6 +55,7 @@
 #ifdef __MINGW32__
 #include <windows.h>
 #include <winioctl.h>
+#include "dirname.h"
 #endif
 
 #ifdef GRUB_UTIL
@@ -322,6 +323,7 @@
   HANDLE hd;
   grub_int64_t size = -1LL;
 
+  strip_trailing_slashes(name);
   hd = CreateFile (name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
                    0, OPEN_EXISTING, 0, 0);
 


_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

Reply via email to