* util/getroot.c (grub_find_device): Use cygwin_conv_path ratherthan

	removed in current versions cygwin_conv_*.

diff --git a/ChangeLog b/ChangeLog
index 2a062fb0c6b74cf400292a55ca888dfc6f04cf56..f340f66e6d5d79d7ec2718e6b17957b273758555 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/getroot.c (grub_find_device): Use cygwin_conv_path ratherthan
+       removed in current versions cygwin_conv_*.
+
 2013-08-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * configure.ac: Disable efiemu runtime on cygwin.

diff --git a/util/getroot.c b/util/getroot.c
index 29e66d406fb409eac31f40f4742330542a0d4cf4..103a3d28579707b89b3183279c3a39c1031735f9 100644 (file)
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -92,6 +92,8 @@
 # include <sys/ioctl.h>
 # include <cygwin/fs.h> /* BLKGETSIZE64 */
 # include <cygwin/hdreg.h> /* HDIO_GETGEO */
+# include <sys/cygwin.h>
+
 # define MAJOR(dev)    ((unsigned) ((dev) >> 16))
 # define FLOPPY_MAJOR  2
 #endif
@@ -1002,8 +1004,9 @@ grub_find_device (const char *path, dev_t dev)
 
   /* Convert to full POSIX and Win32 path.  */
   char fullpath[PATH_MAX], winpath[PATH_MAX];
-  cygwin_conv_to_full_posix_path (path, fullpath);
-  cygwin_conv_to_full_win32_path (fullpath, winpath);
+
+  cygwin_conv_path (CCP_WIN_A_TO_POSIX, path, fullpath, sizeof (fullpath));
+  cygwin_conv_path (CCP_POSIX_TO_WIN_A, fullpath, winpath, sizeof (winpath));
 
   /* If identical, this is no real filesystem path.  */
   if (strcmp (fullpath, winpath) == 0)