GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ppc fixes 

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1423 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Greg Watson 2004-03-17 22:02:12 +00:00
parent 983b189d91
commit 9bc5018259
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/stream/fs/iso9660.c
View File

@ -141,7 +141,7 @@ iso9660_dir (char *dirname)
const char *name = idr->name; const char *name = idr->name;
unsigned int name_len = isonum_711(idr->name_len); unsigned int name_len = isonum_711(idr->name_len);
file_type = ((unsigned int)idr->flags & 2) ? ISO_DIRECTORY : ISO_REGULAR; file_type = (isonum_711(idr->flags) & 2) ? ISO_DIRECTORY : ISO_REGULAR;
if (name_len == 1) if (name_len == 1)
{ {
if ((name[0] == 0) || /* self */ if ((name[0] == 0) || /* self */
@ -161,8 +161,8 @@ iso9660_dir (char *dirname)
* Parse Rock-Ridge extension * Parse Rock-Ridge extension
*/ */
rr_len = (isonum_711(idr->length) - isonum_711(idr->name_len) rr_len = (isonum_711(idr->length) - isonum_711(idr->name_len)
- (unsigned char)sizeof(struct iso_directory_record) - sizeof(struct iso_directory_record)
+ (unsigned char)sizeof(idr->name)); + sizeof(idr->name));
rr_ptr.ptr = ((unsigned char *)idr + isonum_711(idr->name_len) rr_ptr.ptr = ((unsigned char *)idr + isonum_711(idr->name_len)
+ sizeof(struct iso_directory_record) + sizeof(struct iso_directory_record)
- sizeof(idr->name)); - sizeof(idr->name));
@ -180,9 +180,10 @@ iso9660_dir (char *dirname)
printk_debug( printk_debug(
"Non-supported version (%d) RockRidge chunk " "Non-supported version (%d) RockRidge chunk "
"`%c%c'\n", rr_ptr.rr->version, "`%c%c'\n", rr_ptr.rr->version,
rr_ptr.rr->signature & 0xFF, rr_ptr.rr->signature[0],
rr_ptr.rr->signature >> 8); rr_ptr.rr->signature[1]);
#endif #endif
break;
} }
else if (rr_ptr.rr->signature[0] == 'R' else if (rr_ptr.rr->signature[0] == 'R'
&& rr_ptr.rr->signature[1] == 'R' && rr_ptr.rr->signature[1] == 'R'