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

* grub-core/disk/ieee1275/ofdisk.c (grub_ofdisk_iterate): Escape commas.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-20 23:37:24 +02:00
parent eb6d0dd3a1
commit 436575581e
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-06-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/ieee1275/ofdisk.c (grub_ofdisk_iterate): Escape commas.
2012-06-20 Vladimir Serbinenko <phcoder@gmail.com> 2012-06-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/main.c (grub_set_prefix_and_root): Skip escaped commas * grub-core/kern/main.c (grub_set_prefix_and_root): Skip escaped commas

15
grub-core/disk/ieee1275/ofdisk.c
View file

@ -265,10 +265,17 @@ grub_ofdisk_iterate (int (*hook) (const char *name),
continue; continue;
{ {
char buffer[sizeof ("ieee1275/") + grub_strlen (ent->shortest)]; char buffer[sizeof ("ieee1275/") + 2 * grub_strlen (ent->shortest)];
char *ptr; const char *iptr;
ptr = grub_stpcpy (buffer, "ieee1275/"); char *optr;
grub_strcpy (ptr, ent->shortest); optr = grub_stpcpy (buffer, "ieee1275/");
for (iptr = ent->shortest; *iptr; iptr++)
{
if (*iptr == ',')
*optr++ = '\\';
*optr++ = *iptr++;
}
*optr = 0;
if (hook (buffer)) if (hook (buffer))
return 1; return 1;
} }