From 5dd5e64b716b30243f354f34512873aac96d122b Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 23 Aug 2013 08:51:21 +0200 Subject: [PATCH] * util/getroot.c (grub_find_device): Use cygwin_conv_path ratherthan removed in current versions cygwin_conv_*. --- ChangeLog | 5 +++++ util/getroot.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a062fb0c..f340f66e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-08-23 Vladimir Serbinenko + + * util/getroot.c (grub_find_device): Use cygwin_conv_path ratherthan + removed in current versions cygwin_conv_*. + 2013-08-23 Vladimir Serbinenko * configure.ac: Disable efiemu runtime on cygwin. diff --git a/util/getroot.c b/util/getroot.c index 29e66d406..103a3d285 100644 --- a/util/getroot.c +++ b/util/getroot.c @@ -92,6 +92,8 @@ # include # include /* BLKGETSIZE64 */ # include /* HDIO_GETGEO */ +# include + # 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)