brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-08-03 00:33:45 +09:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-fdt

Browse Source
This commit is contained in:
Wolfgang Denk 2009-09-30 23:16:49 +02:00
commit d3909d74cc
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/cmd_fdt.c
View File

@ -574,14 +574,18 @@ static int fdt_parse_prop(char **newval, int count, char *data, int *len)
* Byte stream. Convert the values. * Byte stream. Convert the values.
*/ */
newp++; newp++;
while ((*newp != ']') && (stridx < count)) { while ((stridx < count) && (*newp != ']')) {
while (*newp == ' ')
newp++;
if (*newp == '\0') {
newp = newval[++stridx];
continue;
}
if (!isxdigit(*newp))
break;
tmp = simple_strtoul(newp, &newp, 16); tmp = simple_strtoul(newp, &newp, 16);
*data++ = tmp & 0xFF; *data++ = tmp & 0xFF;
*len = *len + 1; *len = *len + 1;
while (*newp == ' ')
newp++;
if (*newp != '\0')
newp = newval[++stridx];
} }
if (*newp != ']') { if (*newp != ']') {
printf("Unexpected character '%c'\n", *newp); printf("Unexpected character '%c'\n", *newp);
@ -589,12 +593,15 @@ static int fdt_parse_prop(char **newval, int count, char *data, int *len)
} }
} else { } else {
/* /*
* Assume it is a string. Copy it into our data area for * Assume it is one or more strings. Copy it into our
* convenience (including the terminating '\0'). * data area for convenience (including the
* terminating '\0's).
*/ */
while (stridx < count) { while (stridx < count) {
*len = strlen(newp) + 1; size_t length = strlen(newp) + 1;
strcpy(data, newp); strcpy(data, newp);
data += length;
*len += length;
newp = newval[++stridx]; newp = newval[++stridx];
} }
} }