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

Decode XA system area.

Browse Source
This commit is contained in:
Natalia Portillo
2019-07-28 16:48:18 +01:00
parent 7711685439
commit a6c2da7689
4 changed files with 144 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,21 +200,32 @@ namespace DiscImageChef.Filesystems.ISO9660
bool hasResourceFork = false;
if(systemAreaLength > 2)
{
ushort systemAreaSignature = BigEndianBitConverter.ToUInt16(data, systemAreaStart);
int systemAreaOff = systemAreaStart;
int systemAreaEnd = systemAreaStart + systemAreaLength;
if(systemAreaSignature == APPLE_MAGIC)
while(systemAreaOff + 2 <= systemAreaEnd)
{
AppleId appleId = (AppleId)data[systemAreaStart + 3];
ushort systemAreaSignature = BigEndianBitConverter.ToUInt16(data, systemAreaOff);
if(BigEndianBitConverter.ToUInt16(data, systemAreaOff + 6) == XA_MAGIC)
systemAreaSignature = XA_MAGIC;
switch(systemAreaSignature)
{
case APPLE_MAGIC:
byte appleLength = data[systemAreaOff + 2];
AppleId appleId = (AppleId)data[systemAreaOff + 3];
switch(appleId)
{
case AppleId.ProDOS:
AppleProDOSSystemUse appleProDosSystemUse =
Marshal.ByteArrayToStructureLittleEndian<AppleProDOSSystemUse>(data,
systemAreaStart,
systemAreaLength);
systemAreaOff,
Marshal
.SizeOf<
AppleProDOSSystemUse
>());
entry.AppleProDosType = appleProDosSystemUse.aux_type;
entry.AppleDosType = appleProDosSystemUse.type;
@@ -222,8 +233,11 @@ namespace DiscImageChef.Filesystems.ISO9660
break;
case AppleId.HFS:
AppleHFSSystemUse appleHfsSystemUse =
Marshal.ByteArrayToStructureBigEndian<AppleHFSSystemUse>(data, systemAreaStart,
systemAreaLength);
Marshal.ByteArrayToStructureBigEndian<AppleHFSSystemUse>(data, systemAreaOff,
Marshal
.SizeOf<
AppleHFSSystemUse
>());
hasResourceFork = true;
@@ -234,28 +248,36 @@ namespace DiscImageChef.Filesystems.ISO9660
break;
}
}
else if(systemAreaSignature == APPLE_MAGIC_OLD)
{
AppleOldId appleId = (AppleOldId)data[systemAreaStart + 2];
switch(appleId)
systemAreaOff += appleLength;
break;
case APPLE_MAGIC_OLD:
AppleOldId appleOldId = (AppleOldId)data[systemAreaOff + 2];
switch(appleOldId)
{
case AppleOldId.ProDOS:
AppleProDOSOldSystemUse appleProDosOldSystemUse =
Marshal.ByteArrayToStructureLittleEndian<AppleProDOSOldSystemUse>(data,
systemAreaStart,
systemAreaLength);
systemAreaOff,
Marshal
.SizeOf<
AppleProDOSOldSystemUse
>());
entry.AppleProDosType = appleProDosOldSystemUse.aux_type;
entry.AppleDosType = appleProDosOldSystemUse.type;
systemAreaOff += Marshal.SizeOf<AppleProDOSOldSystemUse>();
break;
case AppleOldId.TypeCreator:
case AppleOldId.TypeCreatorBundle:
AppleHFSTypeCreatorSystemUse appleHfsTypeCreatorSystemUse =
Marshal.ByteArrayToStructureBigEndian<AppleHFSTypeCreatorSystemUse>(data,
systemAreaStart,
systemAreaLength);
systemAreaOff,
Marshal
.SizeOf<
AppleHFSTypeCreatorSystemUse
>());
hasResourceFork = true;
@@ -263,12 +285,17 @@ namespace DiscImageChef.Filesystems.ISO9660
entry.FinderInfo.fdCreator = appleHfsTypeCreatorSystemUse.creator;
entry.FinderInfo.fdType = appleHfsTypeCreatorSystemUse.type;
systemAreaOff += Marshal.SizeOf<AppleHFSTypeCreatorSystemUse>();
break;
case AppleOldId.TypeCreatorIcon:
case AppleOldId.TypeCreatorIconBundle:
AppleHFSIconSystemUse appleHfsIconSystemUse =
Marshal.ByteArrayToStructureBigEndian<AppleHFSIconSystemUse>(data, systemAreaStart,
systemAreaLength);
Marshal.ByteArrayToStructureBigEndian<AppleHFSIconSystemUse>(data,
systemAreaOff,
Marshal
.SizeOf<
AppleHFSIconSystemUse
>());
hasResourceFork = true;
@@ -277,11 +304,15 @@ namespace DiscImageChef.Filesystems.ISO9660
entry.FinderInfo.fdType = appleHfsIconSystemUse.type;
entry.AppleIcon = appleHfsIconSystemUse.icon;
systemAreaOff += Marshal.SizeOf<AppleHFSIconSystemUse>();
break;
case AppleOldId.HFS:
AppleHFSOldSystemUse appleHfsSystemUse =
Marshal.ByteArrayToStructureBigEndian<AppleHFSOldSystemUse>(data, systemAreaStart,
systemAreaLength);
Marshal.ByteArrayToStructureBigEndian<AppleHFSOldSystemUse>(data, systemAreaOff,
Marshal
.SizeOf<
AppleHFSOldSystemUse
>());
hasResourceFork = true;
@@ -290,9 +321,25 @@ namespace DiscImageChef.Filesystems.ISO9660
entry.FinderInfo.fdFlags = (FinderFlags)appleHfsSystemUse.finder_flags;
entry.FinderInfo.fdType = appleHfsSystemUse.type;
systemAreaOff += Marshal.SizeOf<AppleHFSOldSystemUse>();
break;
default:
// Cannot continue as we don't know this structure size
systemAreaOff = systemAreaEnd;
break;
default: throw new ArgumentOutOfRangeException();
}
break;
case XA_MAGIC:
entry.XA = Marshal.ByteArrayToStructureBigEndian<CdromXa>(data, systemAreaOff,
Marshal.SizeOf<CdromXa>());
systemAreaOff += Marshal.SizeOf<CdromXa>();
break;
default:
// Cannot continue as we don't know this structure size
systemAreaOff = systemAreaEnd;
break;
}
}

26
DiscImageChef.Filesystems/ISO9660/File.cs
View File

@@ -118,6 +118,20 @@ namespace DiscImageChef.Filesystems.ISO9660
if(entry.AppleIcon != null) stat.Attributes |= FileAttributes.HasCustomIcon;
if(entry.XA != null)
{
if(entry.XA.Value.attributes.HasFlag(XaAttributes.GroupExecute)) stat.Mode |= 8;
if(entry.XA.Value.attributes.HasFlag(XaAttributes.GroupRead)) stat.Mode |= 32;
if(entry.XA.Value.attributes.HasFlag(XaAttributes.OwnerExecute)) stat.Mode |= 64;
if(entry.XA.Value.attributes.HasFlag(XaAttributes.OwnerRead)) stat.Mode |= 256;
if(entry.XA.Value.attributes.HasFlag(XaAttributes.SystemExecute)) stat.Mode |= 1;
if(entry.XA.Value.attributes.HasFlag(XaAttributes.SystemRead)) stat.Mode |= 4;
stat.UID = entry.XA.Value.user;
stat.GID = entry.XA.Value.group;
stat.Inode = entry.XA.Value.filenumber;
}
if(entry.AssociatedFile is null || entry.AssociatedFile.Extent == 0 || entry.AssociatedFile.Size == 0)
return Errno.NoError;
@@ -133,12 +147,12 @@ namespace DiscImageChef.Filesystems.ISO9660
stat.GID = ear.group;
stat.Mode = 0;
if(ear.permissions.HasFlag(Permissions.GroupExecute)) stat.Mode += 8;
if(ear.permissions.HasFlag(Permissions.GroupRead)) stat.Mode += 32;
if(ear.permissions.HasFlag(Permissions.OwnerExecute)) stat.Mode += 64;
if(ear.permissions.HasFlag(Permissions.OwnerRead)) stat.Mode += 256;
if(ear.permissions.HasFlag(Permissions.OtherExecute)) stat.Mode += 1;
if(ear.permissions.HasFlag(Permissions.OtherRead)) stat.Mode += 4;
if(ear.permissions.HasFlag(Permissions.GroupExecute)) stat.Mode |= 8;
if(ear.permissions.HasFlag(Permissions.GroupRead)) stat.Mode |= 32;
if(ear.permissions.HasFlag(Permissions.OwnerExecute)) stat.Mode |= 64;
if(ear.permissions.HasFlag(Permissions.OwnerRead)) stat.Mode |= 256;
if(ear.permissions.HasFlag(Permissions.OtherExecute)) stat.Mode |= 1;
if(ear.permissions.HasFlag(Permissions.OtherRead)) stat.Mode |= 4;
stat.CreationTimeUtc = DateHandlers.Iso9660ToDateTime(ear.creation_date);
stat.LastWriteTimeUtc = DateHandlers.Iso9660ToDateTime(ear.modification_date);

1
DiscImageChef.Filesystems/ISO9660/Structs/Internal.cs
View File

@@ -71,6 +71,7 @@ namespace DiscImageChef.Filesystems.ISO9660
public uint Size;
public DateTime? Timestamp;
public ushort VolumeSequenceNumber;
public CdromXa? XA;
public override string ToString() => Filename;
}

6
DiscImageChef.Filesystems/ISO9660/Structs/XA.cs
View File

@@ -40,13 +40,13 @@ namespace DiscImageChef.Filesystems.ISO9660
[StructLayout(LayoutKind.Sequential, Pack = 1)]
struct CdromXa
{
public ushort group;
public ushort user;
public XaAttributes attributes;
public ushort signature;
public byte filenumber;
public ushort group;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
public byte[] reserved;
public ushort signature;
public ushort user;
}
}
}