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

icondir support

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-11-21 15:29:12 +01:00
parent 8dec533a1c
commit aff798d6f4
2 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gfxmenu/gui_string_util.c
View file

@ -150,18 +150,25 @@ grub_resolve_relative_path (const char *base, const char *path)
char *abspath;
char *canonpath;
char *p;
grub_size_t l;
/* If PATH is an absolute path, then just use it as is. */
if (path[0] == '/' || path[0] == '(')
return canonicalize_path (path);
abspath = grub_malloc (grub_strlen (base) + grub_strlen (path) + 1);
abspath = grub_malloc (grub_strlen (base) + grub_strlen (path) + 3);
if (! abspath)
return 0;
/* Concatenate BASE and PATH.
Note that BASE is expected to have a trailing slash. */
/* Concatenate BASE and PATH. */
p = grub_stpcpy (abspath, base);
l = grub_strlen (abspath);
if (l == 0 || abspath[l-1] != '/')
{
*p = '/';
p++;
*p = 0;
}
grub_stpcpy (p, path);
canonpath = canonicalize_path (abspath);