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

Change to disk->name being raw name. It makes less hidden issues

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-08 21:22:41 +02:00
parent f256469360
commit 43de930c20
5 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
grub-core/kern/device.c
View file

@ -136,7 +136,7 @@ grub_device_iterate (int (*hook) (const char *name))
int iterate_partition (grub_disk_t disk, const grub_partition_t partition)
{
struct part_ent *p;
char *part_name;
p = grub_malloc (sizeof (*p));
if (!p)
@ -144,8 +144,14 @@ grub_device_iterate (int (*hook) (const char *name))
return 1;
}
p->name = grub_xasprintf ("%s,%s%d", disk->name, partition->partmap->name,
partition->number + 1);
part_name = grub_partition_get_name (partition);
if (!part_name)
{
grub_free (p);
return 1;
}
p->name = grub_xasprintf ("%s,%s", disk->name, part_name);
grub_free (part_name);
if (!p->name)
{
grub_free (p);