2009-07-10 Bean <bean123ch@gmail.com>

2009-07-10  Robert Millan  <rmh.grub@aybabtu.com>

        * kern/ieee1275/openfw.c (grub_children_iterate)
        (grub_devalias_iterate): Fix size evaluation for property or path
        strings, which was broken since r2132.
This commit is contained in:
robertmh 2009-07-10 20:19:08 +00:00
parent 7d8a52d3a2
commit 0ae1bf88be
2 changed files with 12 additions and 5 deletions

View file

@ -1,3 +1,10 @@
2009-07-10 Bean <bean123ch@gmail.com>
2009-07-10 Robert Millan <rmh.grub@aybabtu.com>
* kern/ieee1275/openfw.c (grub_children_iterate)
(grub_devalias_iterate): Fix size evaluation for property or path
strings, which was broken since r2132.
2009-07-07 Pavel Roskin <proski@gnu.org> 2009-07-07 Pavel Roskin <proski@gnu.org>
* commands/search.c (search_file): Merge into ... * commands/search.c (search_file): Merge into ...

View file

@ -78,15 +78,15 @@ grub_children_iterate (char *devpath,
grub_ssize_t actual; grub_ssize_t actual;
if (grub_ieee1275_get_property (child, "device_type", childtype, if (grub_ieee1275_get_property (child, "device_type", childtype,
sizeof childtype, &actual)) IEEE1275_MAX_PROP_LEN, &actual))
continue; continue;
if (grub_ieee1275_package_to_path (child, childpath, sizeof childpath, if (grub_ieee1275_package_to_path (child, childpath,
&actual)) IEEE1275_MAX_PATH_LEN, &actual))
continue; continue;
if (grub_ieee1275_get_property (child, "name", childname, if (grub_ieee1275_get_property (child, "name", childname,
sizeof childname, &actual)) IEEE1275_MAX_PATH_LEN, &actual))
continue; continue;
grub_sprintf (fullname, "%s/%s", devpath, childname); grub_sprintf (fullname, "%s/%s", devpath, childname);
@ -176,7 +176,7 @@ grub_devalias_iterate (int (*hook) (struct grub_ieee1275_devalias *alias))
} }
if (grub_ieee1275_get_property (dev, "device_type", devtype, if (grub_ieee1275_get_property (dev, "device_type", devtype,
sizeof devtype, &actual)) IEEE1275_MAX_PROP_LEN, &actual))
{ {
/* NAND device don't have device_type property. */ /* NAND device don't have device_type property. */
devtype[0] = 0; devtype[0] = 0;