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 cluster start calculation for FAT12 and FAT16.

Browse Source
This commit is contained in:
Natalia Portillo
2019-04-28 17:21:48 +01:00
parent a15577076f
commit 7b3d5d3f11
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
DiscImageChef.Filesystems/FAT/Super.cs
View File

@@ -232,6 +232,8 @@ namespace DiscImageChef.Filesystems.FAT
break;
}
ulong firstRootSector = 0;
if(!fat32)
{
// This is to support FAT partitions on hybrid ISO/USB images
@@ -349,13 +351,13 @@ namespace DiscImageChef.Filesystems.FAT
BitConverter.ToUInt16(fakeBpb.jump, 1) >= minBootNearJump &&
BitConverter.ToUInt16(fakeBpb.jump, 1) <= 0x1FC;
// First root directory sector
firstRootSector = (ulong)(fakeBpb.spfat * fakeBpb.fats_no + fakeBpb.rsectors) * sectorsPerRealSector +
partition.Start;
sectorsForRootDirectory = (uint)(fakeBpb.root_ent * 32 / imagePlugin.Info.SectorSize);
sectorsPerRealSector = fakeBpb.bps / imagePlugin.Info.SectorSize;
sectorsPerCluster *= sectorsPerRealSector;
// First root directory sector
firstClusterSector =
(ulong)(fakeBpb.spfat * fakeBpb.fats_no + fakeBpb.rsectors) * sectorsPerRealSector;
sectorsForRootDirectory = (uint)(fakeBpb.root_ent * 32 / imagePlugin.Info.SectorSize);
}
firstClusterSector += partition.Start;
@@ -372,7 +374,8 @@ namespace DiscImageChef.Filesystems.FAT
if(!fat32)
{
rootDirectory = imagePlugin.ReadSectors(firstClusterSector, sectorsForRootDirectory);
firstClusterSector = firstRootSector + sectorsForRootDirectory - sectorsPerCluster * 2;
rootDirectory = imagePlugin.ReadSectors(firstRootSector, sectorsForRootDirectory);
if(bpbKind == BpbKind.DecRainbow)
{
@@ -698,6 +701,8 @@ namespace DiscImageChef.Filesystems.FAT
}
}
System.Console.WriteLine("First cluster sector: {0}", firstClusterSector);
System.Console.WriteLine("Sectors per cluster: {0}", sectorsPerCluster);
mounted = true;
return Errno.NoError;
}