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

* disk/ieee1275/ofdisk.c (compute_dev_path): New.

Browse source 
(grub_ofdisk_open): Use it to un-escape "," characters.
	* kern/disk.c (find_part_sep): New.
	(grub_disk_open): Use it to find the first non-escaped ','
	character in the disk name.
	* util/ieee1275/devicemap.c (escape_of_path): New.
	(grub_util_emit_devicemap_entry): Use it.
	* util/sparc64/ieee1275/grub-install.in: Update script to
	strip partition specifiers properly by not triggering on
	'\' escaped ',' characters.
This commit is contained in:
davem 2009-05-04 23:13:53 +00:00
parent 9554b15eac
commit 67e23c9004
6 changed files with 130 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

38
disk/ieee1275/ofdisk.c
View file

@ -115,6 +115,38 @@ grub_ofdisk_iterate (int (*hook) (const char *name))
return grub_devalias_iterate (dev_iterate);
}
static char *
compute_dev_path (const char *name)
{
char *devpath = grub_malloc (grub_strlen (name) + 2);
char *p, c;
if (!devpath)
return NULL;
/* Un-escape commas. */
p = devpath;
while ((c = *name++) != '\0')
{
if (c == '\\' && *name == ',')
{
*p++ = ',';
name++;
}
else
*p++ = c;
}
if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PARTITION_0))
{
*p++ = ':';
*p++ = '0';
}
*p++ = '\0';
return devpath;
}
static grub_err_t
grub_ofdisk_open (const char *name, grub_disk_t disk)
{
@ -126,14 +158,10 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
char prop[64];
grub_ssize_t actual;
devpath = grub_strndup (name, grub_strlen (name) + 2);
devpath = compute_dev_path (name);
if (! devpath)
return grub_errno;
/* To access the complete disk add `:0'. */
if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PARTITION_0))
grub_strcat (devpath, ":0");
op = ofdisk_hash_find (devpath);
if (!op)
op = ofdisk_hash_add (devpath);