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

🐛Correct UCSD Pascal filesystem on Apple II disks.

Browse Source 
(cherry picked from commit 38725e5625)
This commit is contained in:
Natalia Portillo
2018-01-06 00:41:14 +00:00
parent f5ce818e85
commit d37f9d4d44
6 changed files with 158 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscImageChef.Filesystems/UCSDPascal/Dir.cs
View File

@@ -46,7 +46,7 @@ namespace DiscImageChef.Filesystems.UCSDPascal
if(!string.IsNullOrEmpty(path) && string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0) if(!string.IsNullOrEmpty(path) && string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
return Errno.NotSupported; return Errno.NotSupported;
contents = fileEntries.Select(ent => StringHandlers.PascalToString(ent.filename, CurrentEncoding)).ToList(); contents = fileEntries.Select(ent => StringHandlers.PascalToString(ent.Filename, CurrentEncoding)).ToList();
if(debug) if(debug)
{ {

22
DiscImageChef.Filesystems/UCSDPascal/File.cs
View File

@@ -71,15 +71,19 @@ namespace DiscImageChef.Filesystems.UCSDPascal
if(debug && (string.Compare(path, "$", StringComparison.InvariantCulture) == 0 || if(debug && (string.Compare(path, "$", StringComparison.InvariantCulture) == 0 ||
string.Compare(path, "$Boot", 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 else
{ {
Errno error = GetFileEntry(path, out PascalFileEntry entry); Errno error = GetFileEntry(path, out PascalFileEntry entry);
if(error != Errno.NoError) return error; if(error != Errno.NoError) return error;
byte[] tmp = device.ReadSectors((ulong)entry.firstBlock, (uint)(entry.lastBlock - entry.firstBlock)); byte[] tmp = device.ReadSectors((ulong)entry.FirstBlock * multiplier,
file = new byte[(entry.lastBlock - entry.firstBlock - 1) * device.GetSectorSize() + entry.lastBytes]; (uint)(entry.LastBlock - entry.FirstBlock) * multiplier);
file = new byte[(entry.LastBlock - entry.FirstBlock - 1) * device.GetSectorSize() * multiplier +
entry.LastBytes];
Array.Copy(tmp, 0, file, 0, file.Length); Array.Copy(tmp, 0, file, 0, file.Length);
} }
@@ -110,7 +114,7 @@ namespace DiscImageChef.Filesystems.UCSDPascal
stat = new FileEntryInfo stat = new FileEntryInfo
{ {
Attributes = FileAttributes.System, Attributes = FileAttributes.System,
BlockSize = device.GetSectorSize(), BlockSize = device.GetSectorSize() * multiplier,
DeviceNo = 0, DeviceNo = 0,
GID = 0, GID = 0,
Inode = 0, Inode = 0,
@@ -140,13 +144,13 @@ namespace DiscImageChef.Filesystems.UCSDPascal
stat = new FileEntryInfo stat = new FileEntryInfo
{ {
Attributes = FileAttributes.File, Attributes = FileAttributes.File,
Blocks = entry.lastBlock - entry.firstBlock, Blocks = entry.LastBlock - entry.FirstBlock,
BlockSize = device.GetSectorSize(), BlockSize = device.GetSectorSize() * multiplier,
DeviceNo = 0, DeviceNo = 0,
GID = 0, GID = 0,
Inode = 0, Inode = 0,
LastWriteTimeUtc = DateHandlers.UcsdPascalToDateTime(entry.mtime), LastWriteTimeUtc = DateHandlers.UcsdPascalToDateTime(entry.ModificationTime),
Length = (entry.lastBlock - entry.firstBlock) * device.GetSectorSize() + entry.lastBytes, Length = (entry.LastBlock - entry.FirstBlock) * device.GetSectorSize() * multiplier + entry.LastBytes,
Links = 1, Links = 1,
Mode = 0x124, Mode = 0x124,
UID = 0 UID = 0
@@ -162,7 +166,7 @@ namespace DiscImageChef.Filesystems.UCSDPascal
foreach(PascalFileEntry ent in fileEntries.Where(ent => foreach(PascalFileEntry ent in fileEntries.Where(ent =>
string.Compare(path, string.Compare(path,
StringHandlers StringHandlers
.PascalToString(ent.filename, .PascalToString(ent.Filename,
CurrentEncoding), CurrentEncoding),
StringComparison StringComparison
.InvariantCultureIgnoreCase) == 0)) .InvariantCultureIgnoreCase) == 0))

115
DiscImageChef.Filesystems/UCSDPascal/Info.cs
View File

@@ -33,6 +33,7 @@
using System; using System;
using System.Text; using System.Text;
using DiscImageChef.CommonTypes; using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.DiscImages; using DiscImageChef.DiscImages;
using Schemas; using Schemas;
@@ -45,110 +46,128 @@ namespace DiscImageChef.Filesystems.UCSDPascal
{ {
if(partition.Length < 3) return false; if(partition.Length < 3) return false;
multiplier = (uint)(imagePlugin.ImageInfo.SectorSize == 256 ? 2 : 1);
// Blocks 0 and 1 are boot code // 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(); 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.FirstBlock = BigEndianBitConverter.ToInt16(volBlock, 0x00);
volEntry.lastBlock = BigEndianBitConverter.ToInt16(volBlock, 0x02); volEntry.LastBlock = BigEndianBitConverter.ToInt16(volBlock, 0x02);
volEntry.entryType = (PascalFileKind)BigEndianBitConverter.ToInt16(volBlock, 0x04); volEntry.EntryType = (PascalFileKind)BigEndianBitConverter.ToInt16(volBlock, 0x04);
volEntry.volumeName = new byte[8]; volEntry.VolumeName = new byte[8];
Array.Copy(volBlock, 0x06, volEntry.volumeName, 0, 8); Array.Copy(volBlock, 0x06, volEntry.VolumeName, 0, 8);
volEntry.blocks = BigEndianBitConverter.ToInt16(volBlock, 0x0E); volEntry.Blocks = BigEndianBitConverter.ToInt16(volBlock, 0x0E);
volEntry.files = BigEndianBitConverter.ToInt16(volBlock, 0x10); volEntry.Files = BigEndianBitConverter.ToInt16(volBlock, 0x10);
volEntry.dummy = BigEndianBitConverter.ToInt16(volBlock, 0x12); volEntry.Dummy = BigEndianBitConverter.ToInt16(volBlock, 0x12);
volEntry.lastBoot = BigEndianBitConverter.ToInt16(volBlock, 0x14); volEntry.LastBoot = BigEndianBitConverter.ToInt16(volBlock, 0x14);
volEntry.tail = BigEndianBitConverter.ToInt32(volBlock, 0x16); 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) // 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 // Last volume record block must be after first block, and before end of device
if(volEntry.lastBlock <= volEntry.firstBlock || if(volEntry.LastBlock <= volEntry.FirstBlock ||
(ulong)volEntry.lastBlock > imagePlugin.GetSectors() - 2) return false; (ulong)volEntry.LastBlock > imagePlugin.GetSectors() / multiplier - 2) return false;
// Volume record entry type must be volume or secure // 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 // 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 // Volume blocks is equal to volume sectors
if(volEntry.blocks < 0 || (ulong)volEntry.blocks != imagePlugin.GetSectors()) return false; if(volEntry.Blocks < 0 || (ulong)volEntry.Blocks != imagePlugin.GetSectors() / multiplier) return false;
// There can be not less than zero files // There can be not less than zero files
return volEntry.files >= 0; return volEntry.Files >= 0;
} }
public override void GetInformation(ImagePlugin imagePlugin, Partition partition, out string information) public override void GetInformation(ImagePlugin imagePlugin, Partition partition, out string information)
{ {
StringBuilder sbInformation = new StringBuilder(); StringBuilder sbInformation = new StringBuilder();
information = ""; information = "";
multiplier = (uint)(imagePlugin.ImageInfo.SectorSize == 256 ? 2 : 1);
if(imagePlugin.GetSectors() < 3) return; if(imagePlugin.GetSectors() < 3) return;
// Blocks 0 and 1 are boot code // 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(); 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.FirstBlock = BigEndianBitConverter.ToInt16(volBlock, 0x00);
volEntry.lastBlock = BigEndianBitConverter.ToInt16(volBlock, 0x02); volEntry.LastBlock = BigEndianBitConverter.ToInt16(volBlock, 0x02);
volEntry.entryType = (PascalFileKind)BigEndianBitConverter.ToInt16(volBlock, 0x04); volEntry.EntryType = (PascalFileKind)BigEndianBitConverter.ToInt16(volBlock, 0x04);
volEntry.volumeName = new byte[8]; volEntry.VolumeName = new byte[8];
Array.Copy(volBlock, 0x06, volEntry.volumeName, 0, 8); Array.Copy(volBlock, 0x06, volEntry.VolumeName, 0, 8);
volEntry.blocks = BigEndianBitConverter.ToInt16(volBlock, 0x0E); volEntry.Blocks = BigEndianBitConverter.ToInt16(volBlock, 0x0E);
volEntry.files = BigEndianBitConverter.ToInt16(volBlock, 0x10); volEntry.Files = BigEndianBitConverter.ToInt16(volBlock, 0x10);
volEntry.dummy = BigEndianBitConverter.ToInt16(volBlock, 0x12); volEntry.Dummy = BigEndianBitConverter.ToInt16(volBlock, 0x12);
volEntry.lastBoot = BigEndianBitConverter.ToInt16(volBlock, 0x14); volEntry.LastBoot = BigEndianBitConverter.ToInt16(volBlock, 0x14);
volEntry.tail = BigEndianBitConverter.ToInt32(volBlock, 0x16); volEntry.Tail = BigEndianBitConverter.ToInt32(volBlock, 0x16);
// First block is always 0 (even is it's sector 2) // 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 // Last volume record block must be after first block, and before end of device
if(volEntry.lastBlock <= volEntry.firstBlock || if(volEntry.LastBlock <= volEntry.FirstBlock ||
(ulong)volEntry.lastBlock > imagePlugin.GetSectors() - 2) return; (ulong)volEntry.LastBlock > imagePlugin.GetSectors() / multiplier - 2) return;
// Volume record entry type must be volume or secure // 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 // 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 // Volume blocks is equal to volume sectors
if(volEntry.blocks < 0 || (ulong)volEntry.blocks != imagePlugin.GetSectors()) return; if(volEntry.Blocks < 0 || (ulong)volEntry.Blocks != imagePlugin.GetSectors() / multiplier) return;
// There can be not less than zero files // 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, sbInformation.AppendFormat("Volume record spans from block {0} to block {1}", volEntry.FirstBlock,
volEntry.lastBlock).AppendLine(); volEntry.LastBlock).AppendLine();
sbInformation.AppendFormat("Volume name: {0}", sbInformation.AppendFormat("Volume name: {0}",
StringHandlers.PascalToString(volEntry.volumeName, CurrentEncoding)) StringHandlers.PascalToString(volEntry.VolumeName, CurrentEncoding))
.AppendLine(); .AppendLine();
sbInformation.AppendFormat("Volume has {0} blocks", volEntry.blocks).AppendLine(); sbInformation.AppendFormat("Volume has {0} blocks", volEntry.Blocks).AppendLine();
sbInformation.AppendFormat("Volume has {0} files", volEntry.files).AppendLine(); sbInformation.AppendFormat("Volume has {0} files", volEntry.Files).AppendLine();
sbInformation sbInformation
.AppendFormat("Volume last booted at {0}", DateHandlers.UcsdPascalToDateTime(volEntry.lastBoot)) .AppendFormat("Volume last booted at {0}", DateHandlers.UcsdPascalToDateTime(volEntry.LastBoot))
.AppendLine(); .AppendLine();
information = sbInformation.ToString(); information = sbInformation.ToString();
XmlFsType = new FileSystemType XmlFsType = new FileSystemType
{ {
Bootable = !ArrayHelpers.ArrayIsNullOrEmpty(imagePlugin.ReadSectors(partition.Start, 2)), Bootable =
Clusters = volEntry.blocks, !ArrayHelpers.ArrayIsNullOrEmpty(imagePlugin.ReadSectors(partition.Start, multiplier * 2)),
Clusters = volEntry.Blocks,
ClusterSize = (int)imagePlugin.GetSectorSize(), ClusterSize = (int)imagePlugin.GetSectorSize(),
Files = volEntry.files, Files = volEntry.Files,
FilesSpecified = true, FilesSpecified = true,
Type = "UCSD Pascal", Type = "UCSD Pascal",
VolumeName = StringHandlers.PascalToString(volEntry.volumeName, CurrentEncoding) VolumeName = StringHandlers.PascalToString(volEntry.VolumeName, CurrentEncoding)
}; };
} }
} }

30
DiscImageChef.Filesystems/UCSDPascal/Structs.cs
View File

@@ -38,39 +38,39 @@ namespace DiscImageChef.Filesystems.UCSDPascal
struct PascalVolumeEntry struct PascalVolumeEntry
{ {
/// <summary>0x00, first block of volume entry</summary> /// <summary>0x00, first block of volume entry</summary>
public short firstBlock; public short FirstBlock;
/// <summary>0x02, last block of volume entry</summary> /// <summary>0x02, last block of volume entry</summary>
public short lastBlock; public short LastBlock;
/// <summary>0x04, entry type</summary> /// <summary>0x04, entry type</summary>
public PascalFileKind entryType; public PascalFileKind EntryType;
/// <summary>0x06, volume name</summary> /// <summary>0x06, volume name</summary>
public byte[] volumeName; public byte[] VolumeName;
/// <summary>0x0E, block in volume</summary> /// <summary>0x0E, block in volume</summary>
public short blocks; public short Blocks;
/// <summary>0x10, files in volume</summary> /// <summary>0x10, files in volume</summary>
public short files; public short Files;
/// <summary>0x12, dummy</summary> /// <summary>0x12, dummy</summary>
public short dummy; public short Dummy;
/// <summary>0x14, last booted</summary> /// <summary>0x14, last booted</summary>
public short lastBoot; public short LastBoot;
/// <summary>0x16, tail to make record same size as <see cref="PascalFileEntry" /></summary> /// <summary>0x16, tail to make record same size as <see cref="PascalFileEntry" /></summary>
public int tail; public int Tail;
} }
struct PascalFileEntry struct PascalFileEntry
{ {
/// <summary>0x00, first block of file</summary> /// <summary>0x00, first block of file</summary>
public short firstBlock; public short FirstBlock;
/// <summary>0x02, last block of file</summary> /// <summary>0x02, last block of file</summary>
public short lastBlock; public short LastBlock;
/// <summary>0x04, entry type</summary> /// <summary>0x04, entry type</summary>
public PascalFileKind entryType; public PascalFileKind EntryType;
/// <summary>0x06, file name</summary> /// <summary>0x06, file name</summary>
public byte[] filename; public byte[] Filename;
/// <summary>0x16, bytes used in last block</summary> /// <summary>0x16, bytes used in last block</summary>
public short lastBytes; public short LastBytes;
/// <summary>0x18, modification time</summary> /// <summary>0x18, modification time</summary>
public short mtime; public short ModificationTime;
} }
} }
} }

82
DiscImageChef.Filesystems/UCSDPascal/Super.cs
View File

@@ -49,30 +49,39 @@ namespace DiscImageChef.Filesystems.UCSDPascal
this.debug = debug; this.debug = debug;
if(device.GetSectors() < 3) return Errno.InvalidArgument; if(device.GetSectors() < 3) return Errno.InvalidArgument;
multiplier = (uint)(device.ImageInfo.SectorSize == 256 ? 2 : 1);
// Blocks 0 and 1 are boot code // 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.FirstBlock = BigEndianBitConverter.ToInt16(catalogBlocks, 0x00);
mountedVolEntry.lastBlock = BigEndianBitConverter.ToInt16(catalogBlocks, 0x02); mountedVolEntry.LastBlock = BigEndianBitConverter.ToInt16(catalogBlocks, 0x02);
mountedVolEntry.entryType = (PascalFileKind)BigEndianBitConverter.ToInt16(catalogBlocks, 0x04); mountedVolEntry.EntryType = (PascalFileKind)BigEndianBitConverter.ToInt16(catalogBlocks, 0x04);
mountedVolEntry.volumeName = new byte[8]; mountedVolEntry.VolumeName = new byte[8];
Array.Copy(catalogBlocks, 0x06, mountedVolEntry.volumeName, 0, 8); Array.Copy(catalogBlocks, 0x06, mountedVolEntry.VolumeName, 0, 8);
mountedVolEntry.blocks = BigEndianBitConverter.ToInt16(catalogBlocks, 0x0E); mountedVolEntry.Blocks = BigEndianBitConverter.ToInt16(catalogBlocks, 0x0E);
mountedVolEntry.files = BigEndianBitConverter.ToInt16(catalogBlocks, 0x10); mountedVolEntry.Files = BigEndianBitConverter.ToInt16(catalogBlocks, 0x10);
mountedVolEntry.dummy = BigEndianBitConverter.ToInt16(catalogBlocks, 0x12); mountedVolEntry.Dummy = BigEndianBitConverter.ToInt16(catalogBlocks, 0x12);
mountedVolEntry.lastBoot = BigEndianBitConverter.ToInt16(catalogBlocks, 0x14); mountedVolEntry.LastBoot = BigEndianBitConverter.ToInt16(catalogBlocks, 0x14);
mountedVolEntry.tail = BigEndianBitConverter.ToInt32(catalogBlocks, 0x16); mountedVolEntry.Tail = BigEndianBitConverter.ToInt32(catalogBlocks, 0x16);
if(mountedVolEntry.firstBlock != 0 || mountedVolEntry.lastBlock <= mountedVolEntry.firstBlock || if(mountedVolEntry.FirstBlock != 0 ||
(ulong)mountedVolEntry.lastBlock > device.GetSectors() - 2 || mountedVolEntry.LastBlock <= mountedVolEntry.FirstBlock ||
mountedVolEntry.entryType != PascalFileKind.Volume && (ulong)mountedVolEntry.LastBlock > device.ImageInfo.Sectors / multiplier - 2 ||
mountedVolEntry.entryType != PascalFileKind.Secure || mountedVolEntry.volumeName[0] > 7 || mountedVolEntry.EntryType != PascalFileKind.Volume &&
mountedVolEntry.blocks < 0 || (ulong)mountedVolEntry.blocks != device.GetSectors() || mountedVolEntry.EntryType != PascalFileKind.Secure ||
mountedVolEntry.files < 0) return Errno.InvalidArgument; mountedVolEntry.VolumeName[0] > 7 ||
mountedVolEntry.Blocks < 0 ||
(ulong)mountedVolEntry.Blocks != device.ImageInfo.Sectors / multiplier ||
mountedVolEntry.Files < 0) return Errno.InvalidArgument;
catalogBlocks = device.ReadSectors(2, (uint)(mountedVolEntry.lastBlock - mountedVolEntry.firstBlock - 2)); catalogBlocks = device.ReadSectors(multiplier * 2,
(uint)(mountedVolEntry.LastBlock - mountedVolEntry.FirstBlock - 2) *
multiplier);
int offset = 26; int offset = 26;
fileEntries = new List<PascalFileEntry>(); fileEntries = new List<PascalFileEntry>();
@@ -80,31 +89,31 @@ namespace DiscImageChef.Filesystems.UCSDPascal
{ {
PascalFileEntry entry = new PascalFileEntry PascalFileEntry entry = new PascalFileEntry
{ {
filename = new byte[16], Filename = new byte[16],
firstBlock = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x00), FirstBlock = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x00),
lastBlock = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x02), LastBlock = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x02),
entryType = (PascalFileKind)BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x04), EntryType = (PascalFileKind)BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x04),
lastBytes = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x16), LastBytes = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x16),
mtime = BigEndianBitConverter.ToInt16(catalogBlocks, offset + 0x18) 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; offset += 26;
} }
bootBlocks = device.ReadSectors(0, 2); bootBlocks = device.ReadSectors(0, 2 * multiplier);
XmlFsType = new FileSystemType XmlFsType = new FileSystemType
{ {
Bootable = !ArrayHelpers.ArrayIsNullOrEmpty(bootBlocks), Bootable = !ArrayHelpers.ArrayIsNullOrEmpty(bootBlocks),
Clusters = mountedVolEntry.blocks, Clusters = mountedVolEntry.Blocks,
ClusterSize = (int)device.GetSectorSize(), ClusterSize = (int)device.ImageInfo.SectorSize,
Files = mountedVolEntry.files, Files = mountedVolEntry.Files,
FilesSpecified = true, FilesSpecified = true,
Type = "UCSD Pascal", Type = "UCSD Pascal",
VolumeName = StringHandlers.PascalToString(mountedVolEntry.volumeName, CurrentEncoding) VolumeName = StringHandlers.PascalToString(mountedVolEntry.VolumeName, CurrentEncoding)
}; };
mounted = true; mounted = true;
@@ -123,16 +132,17 @@ namespace DiscImageChef.Filesystems.UCSDPascal
{ {
stat = new FileSystemInfo stat = new FileSystemInfo
{ {
Blocks = mountedVolEntry.blocks, Blocks = mountedVolEntry.Blocks,
FilenameLength = 16, FilenameLength = 16,
Files = (ulong)mountedVolEntry.files, Files = (ulong)mountedVolEntry.Files,
FreeBlocks = 0, FreeBlocks = 0,
PluginId = PluginUuid, PluginId = PluginUuid,
Type = "UCSD Pascal" 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; return Errno.NotImplemented;
} }

2
DiscImageChef.Filesystems/UCSDPascal/UCSDPascal.cs
View File

@@ -50,6 +50,8 @@ namespace DiscImageChef.Filesystems.UCSDPascal
bool mounted; bool mounted;
PascalVolumeEntry mountedVolEntry; PascalVolumeEntry mountedVolEntry;
/// <summary>Apple II disks use 256 bytes / sector, but filesystem assumes it's 512 bytes / sector</summary>
uint multiplier;
public PascalPlugin() public PascalPlugin()
{ {