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

Fix canonicalize_file_name clash.

Browse source 
canonicalize_file_name clashed with gnulib function. Additionally
it was declared in 2 places: emu/misc.h and util/misc.h. Added
grub_ prefix and removed second declaration.
This commit is contained in:
Vladimir Serbinenko 2015-03-04 01:00:19 +01:00
parent 9d25b0da9a
commit 27d1a67f8a
20 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
util/grub-install.c
View file

@ -967,7 +967,7 @@ main (int argc, char *argv[])
{
char * t = grub_util_path_concat (2, bootdir, GRUB_DIR_NAME);
grub_install_mkdir_p (t);
grubdir = canonicalize_file_name (t);
grubdir = grub_canonicalize_file_name (t);
if (!grubdir)
grub_util_error (_("failed to get canonical path of `%s'"), t);
free (t);
@ -1299,7 +1299,7 @@ main (int argc, char *argv[])
{
char *t = grub_util_path_concat (2, grubdir,
platname);
platdir = canonicalize_file_name (t);
platdir = grub_canonicalize_file_name (t);
if (!platdir)
grub_util_error (_("failed to get canonical path of `%s'"),
t);