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

Look for SysVfs at start of second cylinder.

Browse Source
This commit is contained in:
Natalia Portillo
2017-11-08 22:42:29 +00:00
parent 8481f73b2c
commit 8545daf6ba
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
DiscImageChef.Filesystems/SysV.cs
View File

@@ -126,8 +126,15 @@ namespace DiscImageChef.Filesystems
if(partition.End <= (partition.Start + 4 * (ulong)sb_size_in_sectors + sb_size_in_sectors)) // Device must be bigger than SB location + SB size + offset if(partition.End <= (partition.Start + 4 * (ulong)sb_size_in_sectors + sb_size_in_sectors)) // Device must be bigger than SB location + SB size + offset
return false; return false;
// Sectors in a cylinder
int spc = (int)(imagePlugin.ImageInfo.heads * imagePlugin.ImageInfo.sectorsPerTrack);
// Superblock can start on 0x000, 0x200, 0x600 and 0x800, not aligned, so we assume 16 (128 bytes/sector) sectors as a safe value // Superblock can start on 0x000, 0x200, 0x600 and 0x800, not aligned, so we assume 16 (128 bytes/sector) sectors as a safe value
for(int i = 0; i <= 16; i++) int[] locations = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
// Superblock can also skip one cylinder (for boot)
spc};
foreach(int i in locations)
{ {
if(i + sb_size_in_sectors >= (int)imagePlugin.ImageInfo.sectors) if(i + sb_size_in_sectors >= (int)imagePlugin.ImageInfo.sectors)
break; break;
@@ -193,7 +200,7 @@ namespace DiscImageChef.Filesystems
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
BigEndianBitConverter.IsLittleEndian = true; // Start in little endian until we know what are we handling here BigEndianBitConverter.IsLittleEndian = true; // Start in little endian until we know what are we handling here
int start; int start = 0;
uint magic; uint magic;
string s_fname, s_fpack; string s_fname, s_fpack;
ushort s_nfree, s_ninode; ushort s_nfree, s_ninode;
@@ -212,11 +219,17 @@ namespace DiscImageChef.Filesystems
sb_size_in_sectors = (byte)(0x400 / imagePlugin.GetSectorSize()); sb_size_in_sectors = (byte)(0x400 / imagePlugin.GetSectorSize());
else else
sb_size_in_sectors = 1; // If not a single sector can store it sb_size_in_sectors = 1; // If not a single sector can store it
// Sectors in a cylinder
int spc = (int)(imagePlugin.ImageInfo.heads * imagePlugin.ImageInfo.sectorsPerTrack);
// Superblock can start on 0x000, 0x200, 0x600 and 0x800, not aligned, so we assume 16 (128 bytes/sector) sectors as a safe value // Superblock can start on 0x000, 0x200, 0x600 and 0x800, not aligned, so we assume 16 (128 bytes/sector) sectors as a safe value
for(start = 0; start <= 16; start++) int[] locations = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
// Superblock can also skip one cylinder (for boot)
spc};
foreach(int i in locations)
{ {
sb_sector = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors); sb_sector = imagePlugin.ReadSectors((ulong)i + partition.Start, sb_size_in_sectors);
magic = BigEndianBitConverter.ToUInt32(sb_sector, 0x3F8); // XENIX magic location magic = BigEndianBitConverter.ToUInt32(sb_sector, 0x3F8); // XENIX magic location
if(magic == XENIX_MAGIC || magic == SYSV_MAGIC) if(magic == XENIX_MAGIC || magic == SYSV_MAGIC)
@@ -229,6 +242,7 @@ namespace DiscImageChef.Filesystems
} }
else else
xenix = true; xenix = true;
start = i;
break; break;
} }
if(magic == XENIX_CIGAM || magic == SYSV_CIGAM) if(magic == XENIX_CIGAM || magic == SYSV_CIGAM)
@@ -241,6 +255,7 @@ namespace DiscImageChef.Filesystems
} }
else else
xenix = true; xenix = true;
start = i;
break; break;
} }
@@ -250,12 +265,14 @@ namespace DiscImageChef.Filesystems
{ {
BigEndianBitConverter.IsLittleEndian = true; // Little endian BigEndianBitConverter.IsLittleEndian = true; // Little endian
xenix3 = true; xenix3 = true;
start = i;
break; break;
} }
if(magic == XENIX_CIGAM) if(magic == XENIX_CIGAM)
{ {
BigEndianBitConverter.IsLittleEndian = false; // Big endian BigEndianBitConverter.IsLittleEndian = false; // Big endian
xenix3 = true; xenix3 = true;
start = i;
break; break;
} }
@@ -265,12 +282,14 @@ namespace DiscImageChef.Filesystems
{ {
BigEndianBitConverter.IsLittleEndian = true; // Little endian BigEndianBitConverter.IsLittleEndian = true; // Little endian
sysv = true; sysv = true;
start = i;
break; break;
} }
if(magic == SYSV_CIGAM) if(magic == SYSV_CIGAM)
{ {
BigEndianBitConverter.IsLittleEndian = false; // Big endian BigEndianBitConverter.IsLittleEndian = false; // Big endian
sysv = true; sysv = true;
start = i;
break; break;
} }
@@ -284,6 +303,7 @@ namespace DiscImageChef.Filesystems
{ {
BigEndianBitConverter.IsLittleEndian = true; // Coherent is in PDP endianness, use helper for that BigEndianBitConverter.IsLittleEndian = true; // Coherent is in PDP endianness, use helper for that
coherent = true; coherent = true;
start = i;
break; break;
} }
@@ -310,6 +330,7 @@ namespace DiscImageChef.Filesystems
{ {
sys7th = true; sys7th = true;
BigEndianBitConverter.IsLittleEndian = true; BigEndianBitConverter.IsLittleEndian = true;
start = i;
break; break;
} }
} }