aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CD-i attributes reading.

Browse Source
This commit is contained in:
Natalia Portillo
2019-07-31 23:02:43 +01:00
parent 2d71a7574d
commit 6ab2f51178
3 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
DiscImageChef.Filesystems/ISO9660/Dir.cs
View File

@@ -189,16 +189,17 @@ namespace DiscImageChef.Filesystems.ISO9660
continue;
}
entry.CdiSystemArea =
Marshal.ByteArrayToStructureBigEndian<CdiSystemArea>(data,
entryOff + record.name_len +
CdiDirectoryRecordSize, CdiSystemAreaSize);
int systemAreaStart = entryOff + record.name_len + CdiDirectoryRecordSize;
if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.Directory))
if(systemAreaStart % 2 != 0) systemAreaStart++;
entry.CdiSystemArea =
Marshal.ByteArrayToStructureBigEndian<CdiSystemArea>(data, systemAreaStart, CdiSystemAreaSize);
if(((CdiAttributes)entry.CdiSystemArea.Value.attributes).HasFlag(CdiAttributes.Directory))
entry.Flags |= FileFlags.Directory;
if(!entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.Directory) || !usePathTable)
entries[entry.Filename] = entry;
if(!((CdiAttributes)entry.CdiSystemArea.Value.attributes).HasFlag(CdiAttributes.Directory) ||
!usePathTable) entries[entry.Filename] = entry;
entryOff += record.length;
}
@@ -1021,12 +1022,14 @@ namespace DiscImageChef.Filesystems.ISO9660
if(record.flags.HasFlag(CdiFileFlags.Hidden)) entry.Flags |= FileFlags.Hidden;
entry.CdiSystemArea =
Marshal.ByteArrayToStructureBigEndian<CdiSystemArea>(sector,
record.name_len + CdiDirectoryRecordSize,
CdiSystemAreaSize);
int systemAreaStart = record.name_len + CdiDirectoryRecordSize;
if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.Directory))
if(systemAreaStart % 2 != 0) systemAreaStart++;
entry.CdiSystemArea =
Marshal.ByteArrayToStructureBigEndian<CdiSystemArea>(sector, systemAreaStart, CdiSystemAreaSize);
if(((CdiAttributes)entry.CdiSystemArea.Value.attributes).HasFlag(CdiAttributes.Directory))
entry.Flags |= FileFlags.Directory;
entries.Add(entry);