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

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

[Mario Limonciello]

[-- Attachment #1: Type: text/plain, Size: 884 bytes --]

=== 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 <gregoire.sutre@gmail.com>

=== 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);




[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: ml_3427.patch --]
[-- Type: text/x-diff; name="ml_3427.patch", Size: 856 bytes --]

=== 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  <gregoire.sutre@gmail.com>
 

=== 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);
 

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

[Vladimir 'φ-coder/phcoder' Serbinenko]

[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]

Committed. Thanks
On 21.09.2011 22:49, Mario Limonciello wrote:
> === 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 <gregoire.sutre@gmail.com>
>
> === 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
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel


-- 
Regards
Vladimir 'φ-coder/phcoder' Serbinenko



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 294 bytes --]