Changeset 0832b4d in mainline

Timestamp:

2009-01-16T16:14:27Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8ea0308

Parents:

6cd3e8a

Message:

OpenBIOS's nextprop is more sensitive than the OBP version.
Use two char arrays instead of one when determining the number of node's
properties.

—This line,
and those below, will be ignored—

M genarch/ofw_tree.c

File:

• boot/genarch/ofw_tree.c (modified) (4 diffs)

boot/genarch/ofw_tree.c

@@ -83 +83 @@
         static char path[MAX_PATH_LEN+1];
         static char name[OFW_TREE_PROPERTY_MAX_NAMELEN];
+        static char name2[OFW_TREE_PROPERTY_MAX_NAMELEN];
         phandle peer;
         phandle child;
@@ -140 +141 @@
                  */
                 name[0] = '\0';
-                while (ofw_next_property(current, name, name) == 1)
+                while (ofw_next_property(current, name, name2) == 1) {
                         current_node->properties++;
-        
+                        memcpy(name, name2, OFW_TREE_PROPERTY_MAX_NAMELEN);
+                }
+
                 if (!current_node->properties)
                         return;
@@ -154 +157 @@
                 
                 name[0] = '\0';
-                for (i = 0; ofw_next_property(current, name, name) == 1; i++) {
+                for (i = 0; ofw_next_property(current, name, name2) == 1; i++) {
                         size_t size;
                 
@@ -160 +163 @@
                                 break;
                 
+                        memcpy(name, name2, OFW_TREE_PROPERTY_MAX_NAMELEN);
                         memcpy(current_node->property[i].name, name,
                                 OFW_TREE_PROPERTY_MAX_NAMELEN);