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

Support mixed inline and suffix commands

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-12 15:50:52 +02:00
parent 281d690594
commit e64334df29
4 changed files with 94 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

18
grub-core/commands/legacycfg.c
View file

@ -82,31 +82,31 @@ legacy_file (const char *filename)
{
char *oldname = NULL;
int is_suffix;
char *newsuffix;
oldname = entryname;
parsed = grub_legacy_parse (buf, &entryname, &is_suffix);
parsed = grub_legacy_parse (buf, &entryname, &newsuffix);
buf = NULL;
if (is_suffix)
if (newsuffix)
{
char *t;
t = suffix;
suffix = grub_realloc (suffix, grub_strlen (suffix)
+ grub_strlen (parsed) + 1);
+ grub_strlen (newsuffix) + 1);
if (!suffix)
{
grub_free (t);
grub_free (entrysrc);
grub_free (parsed);
grub_free (newsuffix);
grub_free (suffix);
return grub_errno;
}
grub_memcpy (suffix + grub_strlen (suffix), parsed,
grub_strlen (parsed) + 1);
grub_free (parsed);
parsed = NULL;
continue;
grub_memcpy (suffix + grub_strlen (suffix), newsuffix,
grub_strlen (newsuffix) + 1);
grub_free (newsuffix);
newsuffix = NULL;
}
if (oldname != entryname && oldname)
{