[PATCH 2/3] Use _fullpath instead of realpath on mingw32

[PATCH 2/3] Use _fullpath instead of realpath on mingw32

[Mario Limonciello]

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

=== modified file 'ChangeLog'
--- ChangeLog   2011-09-21 20:36:50 +0000
+++ ChangeLog   2011-09-21 20:38:06 +0000
@@ -1,6 +1,7 @@
  2011-09-21  Mario Limonciello <mario_limonciello@dell.com>

         * Remove extra declaration of sleep for mingw32.
+       * No realpath on mingw32.  Instead use _fullpath.

  2011-09-17  Grégoire Sutre <gregoire.sutre@gmail.com>


=== modified file 'grub-core/kern/emu/misc.c'
--- grub-core/kern/emu/misc.c   2011-07-08 11:33:12 +0000
+++ grub-core/kern/emu/misc.c   2011-09-21 20:38:06 +0000
@@ -224,6 +224,11 @@
  canonicalize_file_name (const char *path)
  {
    char *ret;
+#ifdef __MINGW32__
+  ret = xmalloc(PATH_MAX);
+  if (!_fullpath(ret, path, PATH_MAX))
+    return NULL;
+#else
  #ifdef PATH_MAX
    ret = xmalloc (PATH_MAX);
    if (!realpath (path, ret))
@@ -231,6 +236,7 @@
  #else
    ret = realpath (path, NULL);
  #endif
+#endif /* __MINGW32__ */
    return ret;
  }




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

=== modified file 'ChangeLog'
--- ChangeLog	2011-09-21 20:36:50 +0000
+++ ChangeLog	2011-09-21 20:38:06 +0000
@@ -1,6 +1,7 @@
 2011-09-21  Mario Limonciello <mario_limonciello@dell.com>
 
 	* Remove extra declaration of sleep for mingw32.
+	* No realpath on mingw32.  Instead use _fullpath.
 
 2011-09-17  Grégoire Sutre  <gregoire.sutre@gmail.com>
 

=== modified file 'grub-core/kern/emu/misc.c'
--- grub-core/kern/emu/misc.c	2011-07-08 11:33:12 +0000
+++ grub-core/kern/emu/misc.c	2011-09-21 20:38:06 +0000
@@ -224,6 +224,11 @@
 canonicalize_file_name (const char *path)
 {
   char *ret;
+#ifdef __MINGW32__
+  ret = xmalloc(PATH_MAX);
+  if (!_fullpath(ret, path, PATH_MAX))
+    return NULL;
+#else
 #ifdef PATH_MAX
   ret = xmalloc (PATH_MAX);
   if (!realpath (path, ret))
@@ -231,6 +236,7 @@
 #else
   ret = realpath (path, NULL);
 #endif
+#endif /* __MINGW32__ */
   return ret;
 }
 

Re: [PATCH 2/3] Use _fullpath instead of realpath on mingw32

[Vladimir 'φ-coder/phcoder' Serbinenko]

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

Applied. Several stylistic problem (the uselessly nested #if being one
of them) fixed.
On 21.09.2011 22:49, Mario Limonciello wrote:
> === modified file 'ChangeLog'
> --- ChangeLog   2011-09-21 20:36:50 +0000
> +++ ChangeLog   2011-09-21 20:38:06 +0000
> @@ -1,6 +1,7 @@
>  2011-09-21  Mario Limonciello <mario_limonciello@dell.com>
>
>         * Remove extra declaration of sleep for mingw32.
> +       * No realpath on mingw32.  Instead use _fullpath.
>
>  2011-09-17  Grégoire Sutre <gregoire.sutre@gmail.com>
>
>
> === modified file 'grub-core/kern/emu/misc.c'
> --- grub-core/kern/emu/misc.c   2011-07-08 11:33:12 +0000
> +++ grub-core/kern/emu/misc.c   2011-09-21 20:38:06 +0000
> @@ -224,6 +224,11 @@
>  canonicalize_file_name (const char *path)
>  {
>    char *ret;
> +#ifdef __MINGW32__
> +  ret = xmalloc(PATH_MAX);
> +  if (!_fullpath(ret, path, PATH_MAX))
> +    return NULL;
> +#else
>  #ifdef PATH_MAX
>    ret = xmalloc (PATH_MAX);
>    if (!realpath (path, ret))
> @@ -231,6 +236,7 @@
>  #else
>    ret = realpath (path, NULL);
>  #endif
> +#endif /* __MINGW32__ */
>    return ret;
>  }
>
>
>
>
> _______________________________________________
> 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 --]