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

* grub-core/kern/main.c (grub_set_prefix_and_root): Skip escaped commas

Browse source 
when looking for partition separator.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-20 23:33:34 +02:00
parent 3123054474
commit eb6d0dd3a1
2 changed files with 17 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 @@
2012-06-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/main.c (grub_set_prefix_and_root): Skip escaped commas
when looking for partition separator.
2012-06-20 Vladimir Serbinenko <phcoder@gmail.com> 2012-06-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/ieee1275/openfw.c (grub_ieee1275_encode_devname): * grub-core/kern/ieee1275/openfw.c (grub_ieee1275_encode_devname):

14
grub-core/kern/main.c
View file

@ -141,8 +141,18 @@ grub_set_prefix_and_root (void)
/* We have a partition, but still need to fill in the drive. */ /* We have a partition, but still need to fill in the drive. */
char *comma, *new_device; char *comma, *new_device;
comma = grub_strchr (fwdevice, ','); for (comma = fwdevice; *comma; )
if (comma) {
if (comma[0] == '\\' && comma[1] == ',')
{
comma += 2;
continue;
}
if (*comma == ',')
break;
comma++;
}
if (*comma)
{ {
char *drive = grub_strndup (fwdevice, comma - fwdevice); char *drive = grub_strndup (fwdevice, comma - fwdevice);
new_device = grub_xasprintf ("%s%s", drive, device); new_device = grub_xasprintf ("%s%s", drive, device);