vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
removed in current versions cygwin_conv_*.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-08-23 08:51:21 +02:00
parent 1c1f31e5de
commit 5dd5e64b71
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2013-08-23 Vladimir Serbinenko <phcoder@gmail.com>
* configure.ac: Disable efiemu runtime on cygwin. * configure.ac: Disable efiemu runtime on cygwin.

7
util/getroot.c
View file

@ -92,6 +92,8 @@
# include <sys/ioctl.h> # include <sys/ioctl.h>
# include <cygwin/fs.h> /* BLKGETSIZE64 */ # include <cygwin/fs.h> /* BLKGETSIZE64 */
# include <cygwin/hdreg.h> /* HDIO_GETGEO */ # include <cygwin/hdreg.h> /* HDIO_GETGEO */
# include <sys/cygwin.h>
# define MAJOR(dev) ((unsigned) ((dev) >> 16)) # define MAJOR(dev) ((unsigned) ((dev) >> 16))
# define FLOPPY_MAJOR 2 # define FLOPPY_MAJOR 2
#endif #endif
@ -1002,8 +1004,9 @@ grub_find_device (const char *path, dev_t dev)
/* Convert to full POSIX and Win32 path. */ /* Convert to full POSIX and Win32 path. */
char fullpath[PATH_MAX], winpath[PATH_MAX]; 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 identical, this is no real filesystem path. */
if (strcmp (fullpath, winpath) == 0) if (strcmp (fullpath, winpath) == 0)