* grub-core/kern/emu/hostdisk_windows.c (grub_util_get_windows_path):

	Always return full path. Fixes a problem with mkrelpath.

diff --git a/ChangeLog b/ChangeLog
index 505e2234c5b5fb7e9c566b84040b328998f4fcb3..d0f1c5535cecd0c5476aacc6f260b796be639666 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/emu/hostdisk_windows.c (grub_util_get_windows_path):
+       Always return full path. Fixes a problem with mkrelpath.
+
 2013-09-23  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
 
        * util/grub-install.in: Add GPT PReP support.

diff --git a/grub-core/kern/emu/hostdisk_windows.c b/grub-core/kern/emu/hostdisk_windows.c
index 4ebb2f3c0f0dccf14c491c5533ddce27341dd9ff..a197c2d0896c1b64a0bc4efeffe032164b6acd3d 100644 (file)
--- a/grub-core/kern/emu/hostdisk_windows.c
+++ b/grub-core/kern/emu/hostdisk_windows.c
@@ -54,8 +54,8 @@ grub_util_get_windows_path (const char *path)
 {
   LPTSTR winpath;
   winpath = xmalloc (sizeof (winpath[0]) * PATH_MAX);
-  if (cygwin_conv_path (sizeof (winpath[0]) == 1 ? CCP_POSIX_TO_WIN_A
-                       : CCP_POSIX_TO_WIN_W, path, winpath,
+  if (cygwin_conv_path ((sizeof (winpath[0]) == 1 ? CCP_POSIX_TO_WIN_A
+                        : CCP_POSIX_TO_WIN_W) | CCP_ABSOLUTE, path, winpath,
                        sizeof (winpath[0]) * PATH_MAX))
     grub_util_error ("%s", _("cygwin_conv_path() failed"));
   return winpath;
@@ -64,19 +64,28 @@ grub_util_get_windows_path (const char *path)
 LPTSTR
 grub_util_get_windows_path (const char *path)
 {
+  char *fpa;
+  const char *fp;
+  LPTSTR ret;
+
+  fp = fpa = xmalloc (PATH_MAX);
+  if (!_fullpath (fpa, path, PATH_MAX))
+    fp = path;
 #if SIZEOF_TCHAR == 1
-  return xstrdup (path);
+  ret = xstrdup (fp);
 #elif SIZEOF_TCHAR == 2
-  size_t ssz = strlen (path);
+  size_t ssz = strlen (fp);
   size_t tsz = 2 * (GRUB_MAX_UTF16_PER_UTF8 * ssz + 1);
-  LPTSTR ret = xmalloc (tsz);
-  tsz = grub_utf8_to_utf16 (ret, tsz, (const grub_uint8_t *) path, ssz, NULL);
+  ret = xmalloc (tsz);
+  tsz = grub_utf8_to_utf16 (ret, tsz, (const grub_uint8_t *) fp, ssz, NULL);
   ret[tsz] = 0;
-  return ret;
 #else
 #error SIZEOF_TCHAR
 #error "Unsupported TCHAR size"
 #endif
+
+  free (fpa);
+  return ret;
 }
 #endif