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

Refactor, pass whole partition structure to filesystems.

Browse Source
This commit is contained in:
Natalia Portillo
2017-07-19 16:31:08 +01:00
parent 68537136d8
commit 711d19fd04
154 changed files with 980 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
DiscImageChef.Filesystems/AppleMFS/AppleMFS.cs
View File

@@ -1,4 +1,4 @@
// /***************************************************************************
// /***************************************************************************
// The Disc Image Chef
// ----------------------------------------------------------------------------
//
@@ -32,8 +32,9 @@
using System;
using System.Collections.Generic;
using DiscImageChef.ImagePlugins;
using System.Text;
using DiscImageChef.CommonTypes;
using DiscImageChef.ImagePlugins;
namespace DiscImageChef.Filesystems.AppleMFS
{
@@ -68,12 +69,12 @@ namespace DiscImageChef.Filesystems.AppleMFS
CurrentEncoding = Encoding.GetEncoding("macintosh");
}
public AppleMFS(ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd, Encoding encoding)
public AppleMFS(ImagePlugin imagePlugin, Partition partition, Encoding encoding)
{
Name = "Apple Macintosh File System";
PluginUUID = new Guid("36405F8D-0D26-4066-6538-5DBF5D065C3A");
device = imagePlugin;
this.partitionStart = partitionStart;
partitionStart = partition.PartitionStartSector;
if(encoding == null)
CurrentEncoding = Encoding.GetEncoding("macintosh");
}

15
DiscImageChef.Filesystems/AppleMFS/Info.cs
View File

@@ -1,4 +1,4 @@
// /***************************************************************************
// /***************************************************************************
// The Disc Image Chef
// ----------------------------------------------------------------------------
//
@@ -32,20 +32,21 @@
using System;
using System.Text;
using DiscImageChef.CommonTypes;
namespace DiscImageChef.Filesystems.AppleMFS
{
// Information from Inside Macintosh Volume II
public partial class AppleMFS : Filesystem
{
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd)
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, Partition partition)
{
ushort drSigWord;
if((2 + partitionStart) >= partitionEnd)
if((2 + partition.PartitionStartSector) >= partition.PartitionEndSector)
return false;
byte[] mdb_sector = imagePlugin.ReadSector(2 + partitionStart);
byte[] mdb_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian;
@@ -54,7 +55,7 @@ namespace DiscImageChef.Filesystems.AppleMFS
return drSigWord == MFS_MAGIC;
}
public override void GetInformation(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd, out string information)
public override void GetInformation(ImagePlugins.ImagePlugin imagePlugin, Partition partition, out string information)
{
information = "";
@@ -66,8 +67,8 @@ namespace DiscImageChef.Filesystems.AppleMFS
byte[] pString = new byte[16];
byte[] variable_size;
byte[] mdb_sector = imagePlugin.ReadSector(2 + partitionStart);
byte[] bb_sector = imagePlugin.ReadSector(0 + partitionStart);
byte[] mdb_sector = imagePlugin.ReadSector(2 + partition.PartitionStartSector);
byte[] bb_sector = imagePlugin.ReadSector(0 + partition.PartitionStartSector);
BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian;