67e23c9004
(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.
47 lines
1 KiB
C
47 lines
1 KiB
C
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <grub/types.h>
|
|
#include <grub/util/deviceiter.h>
|
|
#include <grub/util/ofpath.h>
|
|
#include <grub/util/misc.h>
|
|
|
|
/* Since OF path names can have "," characters in them, and GRUB
|
|
internally uses "," to indicate partitions (unlike OF which uses
|
|
":" for this purpose) we escape such commas. */
|
|
|
|
static char *
|
|
escape_of_path (const char *orig_path)
|
|
{
|
|
char *new_path, *d, c;
|
|
const char *p;
|
|
|
|
if (!strchr (orig_path, ','))
|
|
return (char *) orig_path;
|
|
|
|
new_path = xmalloc (strlen (orig_path) * 2);
|
|
|
|
p = orig_path;
|
|
d = new_path;
|
|
while ((c = *p++) != '\0')
|
|
{
|
|
if (c == ',')
|
|
*d++ = '\\';
|
|
*d++ = c;
|
|
}
|
|
|
|
free ((char *) orig_path);
|
|
|
|
return new_path;
|
|
}
|
|
|
|
void
|
|
grub_util_emit_devicemap_entry (FILE *fp, char *name, int is_floppy UNUSED,
|
|
int *num_fd UNUSED, int *num_hd UNUSED)
|
|
{
|
|
const char *orig_path = grub_util_devname_to_ofpath (name);
|
|
char *ofpath = escape_of_path (orig_path);
|
|
|
|
fprintf(fp, "(%s)\t%s\n", ofpath, name);
|
|
|
|
free (ofpath);
|
|
}
|