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

Fix build with non-GNU libcs.

Browse source 
* util/misc.c (canonicalize_file_name): Move to ...
* kern/emu/misc.c (canonicalize_file_name): ... here.  Needed by
grub_make_system_path_relative_to_its_root.
This commit is contained in:
Colin Watson 2010-05-18 11:57:31 +01:00
parent 7fb5c25fd0
commit 355b51e9b5
3 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2010-05-18 Colin Watson <cjwatson@ubuntu.com>
Fix build with non-GNU libcs.
* util/misc.c (canonicalize_file_name): Move to ...
* kern/emu/misc.c (canonicalize_file_name): ... here. Needed by
grub_make_system_path_relative_to_its_root.
2010-05-18 Colin Watson <cjwatson@ubuntu.com> 2010-05-18 Colin Watson <cjwatson@ubuntu.com>
* util/grub-mkrescue.in: Sync up with grub-install in terms of how * util/grub-mkrescue.in: Sync up with grub-install in terms of how

13
kern/emu/misc.c
View file

@ -176,6 +176,19 @@ grub_get_rtc (void)
* GRUB_TICKS_PER_SECOND / 1000000)); * GRUB_TICKS_PER_SECOND / 1000000));
} }
char *
canonicalize_file_name (const char *path)
{
char *ret;
#ifdef PATH_MAX
ret = xmalloc (PATH_MAX);
(void) realpath (path, ret);
#else
ret = realpath (path, NULL);
#endif
return ret;
}
#ifdef __CYGWIN__ #ifdef __CYGWIN__
/* Convert POSIX path to Win32 path, /* Convert POSIX path to Win32 path,
remove drive letter, replace backslashes. */ remove drive letter, replace backslashes. */

13
util/misc.c
View file

@ -286,19 +286,6 @@ fail:
#endif /* __MINGW32__ */ #endif /* __MINGW32__ */
char *
canonicalize_file_name (const char *path)
{
char *ret;
#ifdef PATH_MAX
ret = xmalloc (PATH_MAX);
(void) realpath (path, ret);
#else
ret = realpath (path, NULL);
#endif
return ret;
}
#ifdef GRUB_UTIL #ifdef GRUB_UTIL
void void
grub_util_init_nls (void) grub_util_init_nls (void)