From 38725e56250fefe53ec91ab15f566194ff3ecefb Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sat, 6 Jan 2018 00:41:14 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9BCorrect=20UCSD=20Pascal=20filesyste?= =?UTF-8?q?m=20on=20Apple=20II=20disks.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DiscImageChef.Filesystems/UCSDPascal/Dir.cs | 2 +- DiscImageChef.Filesystems/UCSDPascal/File.cs | 56 ++++---- DiscImageChef.Filesystems/UCSDPascal/Info.cs | 127 ++++++++++-------- .../UCSDPascal/Structs.cs | 30 ++--- DiscImageChef.Filesystems/UCSDPascal/Super.cs | 84 ++++++------ .../UCSDPascal/UCSDPascal.cs | 2 + 6 files changed, 167 insertions(+), 134 deletions(-) diff --git a/DiscImageChef.Filesystems/UCSDPascal/Dir.cs b/DiscImageChef.Filesystems/UCSDPascal/Dir.cs index c803c851b..8ae57670f 100644 --- a/DiscImageChef.Filesystems/UCSDPascal/Dir.cs +++ b/DiscImageChef.Filesystems/UCSDPascal/Dir.cs @@ -47,7 +47,7 @@ namespace DiscImageChef.Filesystems.UCSDPascal if(!string.IsNullOrEmpty(path) && string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0) return Errno.NotSupported; - contents = fileEntries.Select(ent => StringHandlers.PascalToString(ent.filename, Encoding)).ToList(); + contents = fileEntries.Select(ent => StringHandlers.PascalToString(ent.Filename, Encoding)).ToList(); if(debug) { diff --git a/DiscImageChef.Filesystems/UCSDPascal/File.cs b/DiscImageChef.Filesystems/UCSDPascal/File.cs index a1a56be9e..d98661ef4 100644 --- a/DiscImageChef.Filesystems/UCSDPascal/File.cs +++ b/DiscImageChef.Filesystems/UCSDPascal/File.cs @@ -70,17 +70,22 @@ namespace DiscImageChef.Filesystems.UCSDPascal byte[] file; - if(debug && (string.Compare(path, "$", StringComparison.InvariantCulture) == 0 || + if(debug && (string.Compare(path, "$", StringComparison.InvariantCulture) == 0 || string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0)) - file = string.Compare(path, "$", StringComparison.InvariantCulture) == 0 ? catalogBlocks : bootBlocks; + file = string.Compare(path, "$", StringComparison.InvariantCulture) == 0 + ? catalogBlocks + : bootBlocks; else { Errno error = GetFileEntry(path, out PascalFileEntry entry); if(error != Errno.NoError) return error; - byte[] tmp = device.ReadSectors((ulong)entry.firstBlock, (uint)(entry.lastBlock - entry.firstBlock)); - file = new byte[(entry.lastBlock - entry.firstBlock - 1) * device.Info.SectorSize + entry.lastBytes]; + byte[] tmp = device.ReadSectors((ulong)entry.FirstBlock * multiplier, + (uint)(entry.LastBlock - entry.FirstBlock) * multiplier); + file = new byte[(entry.LastBlock - entry.FirstBlock - 1) * + device.Info.SectorSize * multiplier + + entry.LastBytes]; Array.Copy(tmp, 0, file, 0, file.Length); } @@ -103,19 +108,19 @@ namespace DiscImageChef.Filesystems.UCSDPascal if(pathElements.Length != 1) return Errno.NotSupported; if(debug) - if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0 || + if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0 || string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0) { stat = new FileEntryInfo { Attributes = FileAttributes.System, - BlockSize = device.Info.SectorSize, - DeviceNo = 0, - GID = 0, - Inode = 0, - Links = 1, - Mode = 0x124, - UID = 0 + BlockSize = device.Info.SectorSize * multiplier, + DeviceNo = 0, + GID = 0, + Inode = 0, + Links = 1, + Mode = 0x124, + UID = 0 }; if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0) @@ -138,17 +143,18 @@ namespace DiscImageChef.Filesystems.UCSDPascal stat = new FileEntryInfo { - Attributes = FileAttributes.File, - Blocks = entry.lastBlock - entry.firstBlock, - BlockSize = device.Info.SectorSize, - DeviceNo = 0, - GID = 0, - Inode = 0, - LastWriteTimeUtc = DateHandlers.UcsdPascalToDateTime(entry.mtime), - Length = (entry.lastBlock - entry.firstBlock) * device.Info.SectorSize + entry.lastBytes, + Attributes = FileAttributes.File, + Blocks = entry.LastBlock - entry.FirstBlock, + BlockSize = device.Info.SectorSize * multiplier, + DeviceNo = 0, + GID = 0, + Inode = 0, + LastWriteTimeUtc = DateHandlers.UcsdPascalToDateTime(entry.ModificationTime), + Length = (entry.LastBlock - entry.FirstBlock) * device.Info.SectorSize * multiplier + + entry.LastBytes, Links = 1, - Mode = 0x124, - UID = 0 + Mode = 0x124, + UID = 0 }; return Errno.NoError; @@ -161,10 +167,10 @@ namespace DiscImageChef.Filesystems.UCSDPascal foreach(PascalFileEntry ent in fileEntries.Where(ent => string.Compare(path, StringHandlers - .PascalToString(ent.filename, - Encoding), + .PascalToString(ent.Filename, + Encoding), StringComparison - .InvariantCultureIgnoreCase) == 0)) + .InvariantCultureIgnoreCase) == 0)) { entry = ent; return Errno.NoError; diff --git a/DiscImageChef.Filesystems/UCSDPascal/Info.cs b/DiscImageChef.Filesystems/UCSDPascal/Info.cs index 973568f8f..752955d63 100644 --- a/DiscImageChef.Filesystems/UCSDPascal/Info.cs +++ b/DiscImageChef.Filesystems/UCSDPascal/Info.cs @@ -34,6 +34,7 @@ using System; using System.Text; using Claunia.Encoding; using DiscImageChef.CommonTypes; +using DiscImageChef.Console; using DiscImageChef.DiscImages; using Schemas; using Encoding = System.Text.Encoding; @@ -47,111 +48,129 @@ namespace DiscImageChef.Filesystems.UCSDPascal { if(partition.Length < 3) return false; + multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1); + // Blocks 0 and 1 are boot code - byte[] volBlock = imagePlugin.ReadSector(2 + partition.Start); + byte[] volBlock = imagePlugin.ReadSectors(multiplier * 2 + partition.Start, multiplier); PascalVolumeEntry volEntry = new PascalVolumeEntry(); - BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian; + // On Apple II, it's little endian + BigEndianBitConverter.IsLittleEndian = + multiplier == 2 ? !BitConverter.IsLittleEndian : BitConverter.IsLittleEndian; - volEntry.firstBlock = BigEndianBitConverter.ToInt16(volBlock, 0x00); - volEntry.lastBlock = BigEndianBitConverter.ToInt16(volBlock, 0x02); - volEntry.entryType = (PascalFileKind)BigEndianBitConverter.ToInt16(volBlock, 0x04); - volEntry.volumeName = new byte[8]; - Array.Copy(volBlock, 0x06, volEntry.volumeName, 0, 8); - volEntry.blocks = BigEndianBitConverter.ToInt16(volBlock, 0x0E); - volEntry.files = BigEndianBitConverter.ToInt16(volBlock, 0x10); - volEntry.dummy = BigEndianBitConverter.ToInt16(volBlock, 0x12); - volEntry.lastBoot = BigEndianBitConverter.ToInt16(volBlock, 0x14); - volEntry.tail = BigEndianBitConverter.ToInt32(volBlock, 0x16); + volEntry.FirstBlock = BigEndianBitConverter.ToInt16(volBlock, 0x00); + volEntry.LastBlock = BigEndianBitConverter.ToInt16(volBlock, 0x02); + volEntry.EntryType = (PascalFileKind)BigEndianBitConverter.ToInt16(volBlock, 0x04); + volEntry.VolumeName = new byte[8]; + Array.Copy(volBlock, 0x06, volEntry.VolumeName, 0, 8); + volEntry.Blocks = BigEndianBitConverter.ToInt16(volBlock, 0x0E); + volEntry.Files = BigEndianBitConverter.ToInt16(volBlock, 0x10); + volEntry.Dummy = BigEndianBitConverter.ToInt16(volBlock, 0x12); + volEntry.LastBoot = BigEndianBitConverter.ToInt16(volBlock, 0x14); + volEntry.Tail = BigEndianBitConverter.ToInt32(volBlock, 0x16); + + DicConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.firstBlock = {0}", volEntry.FirstBlock); + DicConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.lastBlock = {0}", volEntry.LastBlock); + DicConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.entryType = {0}", volEntry.EntryType); + DicConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.volumeName = {0}", volEntry.VolumeName); + DicConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.blocks = {0}", volEntry.Blocks); + DicConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.files = {0}", volEntry.Files); + DicConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.dummy = {0}", volEntry.Dummy); + DicConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.lastBoot = {0}", volEntry.LastBoot); + DicConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.tail = {0}", volEntry.Tail); // First block is always 0 (even is it's sector 2) - if(volEntry.firstBlock != 0) return false; + if(volEntry.FirstBlock != 0) return false; // Last volume record block must be after first block, and before end of device - if(volEntry.lastBlock <= volEntry.firstBlock || - (ulong)volEntry.lastBlock > imagePlugin.Info.Sectors - 2) return false; + if(volEntry.LastBlock <= volEntry.FirstBlock || + (ulong)volEntry.LastBlock > imagePlugin.Info.Sectors / multiplier - 2) return false; // Volume record entry type must be volume or secure - if(volEntry.entryType != PascalFileKind.Volume && volEntry.entryType != PascalFileKind.Secure) return false; + if(volEntry.EntryType != PascalFileKind.Volume && volEntry.EntryType != PascalFileKind.Secure) return false; // Volume name is max 7 characters - if(volEntry.volumeName[0] > 7) return false; + if(volEntry.VolumeName[0] > 7) return false; // Volume blocks is equal to volume sectors - if(volEntry.blocks < 0 || (ulong)volEntry.blocks != imagePlugin.Info.Sectors) return false; + if(volEntry.Blocks < 0 || (ulong)volEntry.Blocks != imagePlugin.Info.Sectors / multiplier) return false; // There can be not less than zero files - return volEntry.files >= 0; + return volEntry.Files >= 0; } public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information, - Encoding encoding) + Encoding encoding) { - Encoding = encoding ?? new Apple2(); + Encoding = encoding ?? new Apple2(); StringBuilder sbInformation = new StringBuilder(); - information = ""; + information = ""; + multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1); if(imagePlugin.Info.Sectors < 3) return; // Blocks 0 and 1 are boot code - byte[] volBlock = imagePlugin.ReadSector(2 + partition.Start); + byte[] volBlock = imagePlugin.ReadSectors(multiplier * 2 + partition.Start, multiplier); PascalVolumeEntry volEntry = new PascalVolumeEntry(); - BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian; + // On Apple //, it's little endian + BigEndianBitConverter.IsLittleEndian = + multiplier == 2 ? !BitConverter.IsLittleEndian : BitConverter.IsLittleEndian; - volEntry.firstBlock = BigEndianBitConverter.ToInt16(volBlock, 0x00); - volEntry.lastBlock = BigEndianBitConverter.ToInt16(volBlock, 0x02); - volEntry.entryType = (PascalFileKind)BigEndianBitConverter.ToInt16(volBlock, 0x04); - volEntry.volumeName = new byte[8]; - Array.Copy(volBlock, 0x06, volEntry.volumeName, 0, 8); - volEntry.blocks = BigEndianBitConverter.ToInt16(volBlock, 0x0E); - volEntry.files = BigEndianBitConverter.ToInt16(volBlock, 0x10); - volEntry.dummy = BigEndianBitConverter.ToInt16(volBlock, 0x12); - volEntry.lastBoot = BigEndianBitConverter.ToInt16(volBlock, 0x14); - volEntry.tail = BigEndianBitConverter.ToInt32(volBlock, 0x16); + volEntry.FirstBlock = BigEndianBitConverter.ToInt16(volBlock, 0x00); + volEntry.LastBlock = BigEndianBitConverter.ToInt16(volBlock, 0x02); + volEntry.EntryType = (PascalFileKind)BigEndianBitConverter.ToInt16(volBlock, 0x04); + volEntry.VolumeName = new byte[8]; + Array.Copy(volBlock, 0x06, volEntry.VolumeName, 0, 8); + volEntry.Blocks = BigEndianBitConverter.ToInt16(volBlock, 0x0E); + volEntry.Files = BigEndianBitConverter.ToInt16(volBlock, 0x10); + volEntry.Dummy = BigEndianBitConverter.ToInt16(volBlock, 0x12); + volEntry.LastBoot = BigEndianBitConverter.ToInt16(volBlock, 0x14); + volEntry.Tail = BigEndianBitConverter.ToInt32(volBlock, 0x16); // First block is always 0 (even is it's sector 2) - if(volEntry.firstBlock != 0) return; + if(volEntry.FirstBlock != 0) return; // Last volume record block must be after first block, and before end of device - if(volEntry.lastBlock <= volEntry.firstBlock || - (ulong)volEntry.lastBlock > imagePlugin.Info.Sectors - 2) return; + if(volEntry.LastBlock <= volEntry.FirstBlock || + (ulong)volEntry.LastBlock > imagePlugin.Info.Sectors / multiplier - 2) return; // Volume record entry type must be volume or secure - if(volEntry.entryType != PascalFileKind.Volume && volEntry.entryType != PascalFileKind.Secure) return; + if(volEntry.EntryType != PascalFileKind.Volume && volEntry.EntryType != PascalFileKind.Secure) return; // Volume name is max 7 characters - if(volEntry.volumeName[0] > 7) return; + if(volEntry.VolumeName[0] > 7) return; // Volume blocks is equal to volume sectors - if(volEntry.blocks < 0 || (ulong)volEntry.blocks != imagePlugin.Info.Sectors) return; + if(volEntry.Blocks < 0 || (ulong)volEntry.Blocks != imagePlugin.Info.Sectors / multiplier) return; // There can be not less than zero files - if(volEntry.files < 0) return; + if(volEntry.Files < 0) return; - sbInformation.AppendFormat("Volume record spans from block {0} to block {1}", volEntry.firstBlock, - volEntry.lastBlock).AppendLine(); - sbInformation.AppendFormat("Volume name: {0}", StringHandlers.PascalToString(volEntry.volumeName, Encoding)) + sbInformation.AppendFormat("Volume record spans from block {0} to block {1}", volEntry.FirstBlock, + volEntry.LastBlock).AppendLine(); + sbInformation.AppendFormat("Volume name: {0}", StringHandlers.PascalToString(volEntry.VolumeName, Encoding)) .AppendLine(); - sbInformation.AppendFormat("Volume has {0} blocks", volEntry.blocks).AppendLine(); - sbInformation.AppendFormat("Volume has {0} files", volEntry.files).AppendLine(); + sbInformation.AppendFormat("Volume has {0} blocks", volEntry.Blocks).AppendLine(); + sbInformation.AppendFormat("Volume has {0} files", volEntry.Files).AppendLine(); sbInformation - .AppendFormat("Volume last booted at {0}", DateHandlers.UcsdPascalToDateTime(volEntry.lastBoot)) - .AppendLine(); + .AppendFormat("Volume last booted at {0}", DateHandlers.UcsdPascalToDateTime(volEntry.LastBoot)) + .AppendLine(); information = sbInformation.ToString(); XmlFsType = new FileSystemType { - Bootable = !ArrayHelpers.ArrayIsNullOrEmpty(imagePlugin.ReadSectors(partition.Start, 2)), - Clusters = volEntry.blocks, - ClusterSize = (int)imagePlugin.Info.SectorSize, - Files = volEntry.files, + Bootable = + !ArrayHelpers.ArrayIsNullOrEmpty(imagePlugin.ReadSectors(partition.Start, multiplier * 2)), + Clusters = volEntry.Blocks, + ClusterSize = (int)imagePlugin.Info.SectorSize, + Files = volEntry.Files, FilesSpecified = true, - Type = "UCSD Pascal", - VolumeName = StringHandlers.PascalToString(volEntry.volumeName, Encoding) + Type = "UCSD Pascal", + VolumeName = StringHandlers.PascalToString(volEntry.VolumeName, Encoding) }; } } diff --git a/DiscImageChef.Filesystems/UCSDPascal/Structs.cs b/DiscImageChef.Filesystems/UCSDPascal/Structs.cs index 50390e133..5679bdf9a 100644 --- a/DiscImageChef.Filesystems/UCSDPascal/Structs.cs +++ b/DiscImageChef.Filesystems/UCSDPascal/Structs.cs @@ -38,39 +38,39 @@ namespace DiscImageChef.Filesystems.UCSDPascal struct PascalVolumeEntry { /// 0x00, first block of volume entry - public short firstBlock; + public short FirstBlock; /// 0x02, last block of volume entry - public short lastBlock; + public short LastBlock; /// 0x04, entry type - public PascalFileKind entryType; + public PascalFileKind EntryType; /// 0x06, volume name - public byte[] volumeName; + public byte[] VolumeName; /// 0x0E, block in volume - public short blocks; + public short Blocks; /// 0x10, files in volume - public short files; + public short Files; /// 0x12, dummy - public short dummy; + public short Dummy; /// 0x14, last booted - public short lastBoot; + public short LastBoot; /// 0x16, tail to make record same size as - public int tail; + public int Tail; } struct PascalFileEntry { /// 0x00, first block of file - public short firstBlock; + public short FirstBlock; /// 0x02, last block of file - public short lastBlock; + public short LastBlock; /// 0x04, entry type - public PascalFileKind entryType; + public PascalFileKind EntryType; /// 0x06, file name - public byte[] filename; + public byte[] Filename; /// 0x16, bytes used in last block - public short lastBytes; + public short LastBytes; /// 0x18, modification time - public short mtime; + public short ModificationTime; } } } \ No newline at end of file diff --git a/DiscImageChef.Filesystems/UCSDPascal/Super.cs b/DiscImageChef.Filesystems/UCSDPascal/Super.cs index 2e2f70243..d93572f9c 100644 --- a/DiscImageChef.Filesystems/UCSDPascal/Super.cs +++ b/DiscImageChef.Filesystems/UCSDPascal/Super.cs @@ -52,65 +52,71 @@ namespace DiscImageChef.Filesystems.UCSDPascal if(options.TryGetValue("debug", out string debugString)) bool.TryParse(debugString, out debug); if(device.Info.Sectors < 3) return Errno.InvalidArgument; + multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1); + // Blocks 0 and 1 are boot code - catalogBlocks = device.ReadSector(2); + catalogBlocks = device.ReadSectors(multiplier * 2, multiplier); - BigEndianBitConverter.IsLittleEndian = BitConverter.IsLittleEndian; + // On Apple //, it's little endian + BigEndianBitConverter.IsLittleEndian = + multiplier == 2 ? !BitConverter.IsLittleEndian : BitConverter.IsLittleEndian; - mountedVolEntry.firstBlock = BigEndianBitConverter.ToInt16(catalogBlocks, 0x00); - mountedVolEntry.lastBlock = BigEndianBitConverter.ToInt16(catalogBlocks, 0x02); - mountedVolEntry.entryType = (PascalFileKind)BigEndianBitConverter.ToInt16(catalogBlocks, 0x04); - mountedVolEntry.volumeName = new byte[8]; - Array.Copy(catalogBlocks, 0x06, mountedVolEntry.volumeName, 0, 8); - mountedVolEntry.blocks = BigEndianBitConverter.ToInt16(catalogBlocks, 0x0E); - mountedVolEntry.files = BigEndianBitConverter.ToInt16(catalogBlocks, 0x10); - mountedVolEntry.dummy = BigEndianBitConverter.ToInt16(catalogBlocks, 0x12); - mountedVolEntry.lastBoot = BigEndianBitConverter.ToInt16(catalogBlocks, 0x14); - mountedVolEntry.tail = BigEndianBitConverter.ToInt32(catalogBlocks, 0x16); + mountedVolEntry.FirstBlock = BigEndianBitConverter.ToInt16(catalogBlocks, 0x00); + mountedVolEntry.LastBlock = BigEndianBitConverter.ToInt16(catalogBlocks, 0x02); + mountedVolEntry.EntryType = (PascalFileKind)BigEndianBitConverter.ToInt16(catalogBlocks, 0x04); + mountedVolEntry.VolumeName = new byte[8]; + Array.Copy(catalogBlocks, 0x06, mountedVolEntry.VolumeName, 0, 8); + mountedVolEntry.Blocks = BigEndianBitConverter.ToInt16(catalogBlocks, 0x0E); + mountedVolEntry.Files = BigEndianBitConverter.ToInt16(catalogBlocks, 0x10); + mountedVolEntry.Dummy = BigEndianBitConverter.ToInt16(catalogBlocks, 0x12); + mountedVolEntry.LastBoot = BigEndianBitConverter.ToInt16(catalogBlocks, 0x14); + mountedVolEntry.Tail = BigEndianBitConverter.ToInt32(catalogBlocks, 0x16); - if(mountedVolEntry.firstBlock != 0 || - mountedVolEntry.lastBlock <= mountedVolEntry.firstBlock || - (ulong)mountedVolEntry.lastBlock > device.Info.Sectors - 2 || - mountedVolEntry.entryType != PascalFileKind.Volume && - mountedVolEntry.entryType != PascalFileKind.Secure || - mountedVolEntry.volumeName[0] > 7 || - mountedVolEntry.blocks < 0 || - (ulong)mountedVolEntry.blocks != device.Info.Sectors || - mountedVolEntry.files < 0) return Errno.InvalidArgument; + if(mountedVolEntry.FirstBlock != 0 || + mountedVolEntry.LastBlock <= mountedVolEntry.FirstBlock || + (ulong)mountedVolEntry.LastBlock > device.Info.Sectors / multiplier - 2 || + mountedVolEntry.EntryType != PascalFileKind.Volume && + mountedVolEntry.EntryType != PascalFileKind.Secure || + mountedVolEntry.VolumeName[0] > 7 || + mountedVolEntry.Blocks < 0 || + (ulong)mountedVolEntry.Blocks != device.Info.Sectors / multiplier || + mountedVolEntry.Files < 0) return Errno.InvalidArgument; - catalogBlocks = device.ReadSectors(2, (uint)(mountedVolEntry.lastBlock - mountedVolEntry.firstBlock - 2)); - int offset = 26; + catalogBlocks = device.ReadSectors(multiplier * 2, + (uint)(mountedVolEntry.LastBlock - mountedVolEntry.FirstBlock - 2) * + multiplier); + int offset = 26; fileEntries = new List(); while(offset + 26 < catalogBlocks.Length) { PascalFileEntry entry = new PascalFileEntry { - filename = new byte[16], - firstBlock = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x00), - lastBlock = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x02), - entryType = (PascalFileKind)BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x04), - lastBytes = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x16), - mtime = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x18) + Filename = new byte[16], + FirstBlock = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x00), + LastBlock = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x02), + EntryType = (PascalFileKind)BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x04), + LastBytes = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x16), + ModificationTime = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x18) }; - Array.Copy(catalogBlocks, offset + 0x06, entry.filename, 0, 16); + Array.Copy(catalogBlocks, offset + 0x06, entry.Filename, 0, 16); - if(entry.filename[0] <= 15 && entry.filename[0] > 0) fileEntries.Add(entry); + if(entry.Filename[0] <= 15 && entry.Filename[0] > 0) fileEntries.Add(entry); offset += 26; } - bootBlocks = device.ReadSectors(0, 2); + bootBlocks = device.ReadSectors(0, 2 * multiplier); XmlFsType = new FileSystemType { Bootable = !ArrayHelpers.ArrayIsNullOrEmpty(bootBlocks), - Clusters = mountedVolEntry.blocks, + Clusters = mountedVolEntry.Blocks, ClusterSize = (int)device.Info.SectorSize, - Files = mountedVolEntry.files, + Files = mountedVolEntry.Files, FilesSpecified = true, Type = "UCSD Pascal", - VolumeName = StringHandlers.PascalToString(mountedVolEntry.volumeName, Encoding) + VolumeName = StringHandlers.PascalToString(mountedVolEntry.VolumeName, Encoding) }; mounted = true; @@ -129,17 +135,17 @@ namespace DiscImageChef.Filesystems.UCSDPascal { stat = new FileSystemInfo { - Blocks = mountedVolEntry.blocks, + Blocks = mountedVolEntry.Blocks, FilenameLength = 16, - Files = (ulong)mountedVolEntry.files, + Files = (ulong)mountedVolEntry.Files, FreeBlocks = 0, PluginId = Id, Type = "UCSD Pascal" }; - stat.FreeBlocks = mountedVolEntry.blocks - (mountedVolEntry.lastBlock - mountedVolEntry.firstBlock); + stat.FreeBlocks = mountedVolEntry.Blocks - (mountedVolEntry.LastBlock - mountedVolEntry.FirstBlock); - foreach(PascalFileEntry entry in fileEntries) stat.FreeBlocks -= entry.lastBlock - entry.firstBlock; + foreach(PascalFileEntry entry in fileEntries) stat.FreeBlocks -= entry.LastBlock - entry.FirstBlock; return Errno.NotImplemented; } diff --git a/DiscImageChef.Filesystems/UCSDPascal/UCSDPascal.cs b/DiscImageChef.Filesystems/UCSDPascal/UCSDPascal.cs index 4efb81436..50ccddcf8 100644 --- a/DiscImageChef.Filesystems/UCSDPascal/UCSDPascal.cs +++ b/DiscImageChef.Filesystems/UCSDPascal/UCSDPascal.cs @@ -50,6 +50,8 @@ namespace DiscImageChef.Filesystems.UCSDPascal bool mounted; PascalVolumeEntry mountedVolEntry; + /// Apple II disks use 256 bytes / sector, but filesystem assumes it's 512 bytes / sector + uint multiplier; public FileSystemType XmlFsType { get; private set; } public string Name => "U.C.S.D. Pascal filesystem";