Code restyling.

This commit is contained in:
2020-02-29 18:03:35 +00:00
parent 4ea327f0c6
commit f7e173710e
855 changed files with 43605 additions and 38045 deletions

View File

@@ -54,10 +54,14 @@ namespace Aaru.Filesystems
public bool Identify(IMediaImage imagePlugin, Partition partition)
{
uint bootSectors = JFS_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
if(partition.Start + bootSectors >= partition.End) return false;
if(partition.Start + bootSectors >= partition.End)
return false;
byte[] sector = imagePlugin.ReadSector(partition.Start + bootSectors);
if(sector.Length < 512) return false;
if(sector.Length < 512)
return false;
JfsSuperBlock jfsSb = Marshal.ByteArrayToStructureLittleEndian<JfsSuperBlock>(sector);
@@ -65,14 +69,16 @@ namespace Aaru.Filesystems
}
public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
Encoding encoding)
Encoding encoding)
{
Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15");
information = "";
StringBuilder sb = new StringBuilder();
uint bootSectors = JFS_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
byte[] sector = imagePlugin.ReadSector(partition.Start + bootSectors);
if(sector.Length < 512) return;
var sb = new StringBuilder();
uint bootSectors = JFS_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
byte[] sector = imagePlugin.ReadSector(partition.Start + bootSectors);
if(sector.Length < 512)
return;
JfsSuperBlock jfsSb = Marshal.ByteArrayToStructureLittleEndian<JfsSuperBlock>(sector);
@@ -81,46 +87,93 @@ namespace Aaru.Filesystems
sb.AppendFormat("{0} blocks of {1} bytes", jfsSb.s_size, jfsSb.s_bsize).AppendLine();
sb.AppendFormat("{0} blocks per allocation group", jfsSb.s_agsize).AppendLine();
if(jfsSb.s_flags.HasFlag(JfsFlags.Unicode)) sb.AppendLine("Volume uses Unicode for directory entries");
if(jfsSb.s_flags.HasFlag(JfsFlags.RemountRO)) sb.AppendLine("Volume remounts read-only on error");
if(jfsSb.s_flags.HasFlag(JfsFlags.Continue)) sb.AppendLine("Volume continues on error");
if(jfsSb.s_flags.HasFlag(JfsFlags.Panic)) sb.AppendLine("Volume panics on error");
if(jfsSb.s_flags.HasFlag(JfsFlags.UserQuota)) sb.AppendLine("Volume has user quotas enabled");
if(jfsSb.s_flags.HasFlag(JfsFlags.GroupQuota)) sb.AppendLine("Volume has group quotas enabled");
if(jfsSb.s_flags.HasFlag(JfsFlags.NoJournal)) sb.AppendLine("Volume is not using any journal");
if(jfsSb.s_flags.HasFlag(JfsFlags.Unicode))
sb.AppendLine("Volume uses Unicode for directory entries");
if(jfsSb.s_flags.HasFlag(JfsFlags.RemountRO))
sb.AppendLine("Volume remounts read-only on error");
if(jfsSb.s_flags.HasFlag(JfsFlags.Continue))
sb.AppendLine("Volume continues on error");
if(jfsSb.s_flags.HasFlag(JfsFlags.Panic))
sb.AppendLine("Volume panics on error");
if(jfsSb.s_flags.HasFlag(JfsFlags.UserQuota))
sb.AppendLine("Volume has user quotas enabled");
if(jfsSb.s_flags.HasFlag(JfsFlags.GroupQuota))
sb.AppendLine("Volume has group quotas enabled");
if(jfsSb.s_flags.HasFlag(JfsFlags.NoJournal))
sb.AppendLine("Volume is not using any journal");
if(jfsSb.s_flags.HasFlag(JfsFlags.Discard))
sb.AppendLine("Volume sends TRIM/UNMAP commands to underlying device");
if(jfsSb.s_flags.HasFlag(JfsFlags.GroupCommit)) sb.AppendLine("Volume commits in groups of 1");
if(jfsSb.s_flags.HasFlag(JfsFlags.LazyCommit)) sb.AppendLine("Volume commits lazy");
if(jfsSb.s_flags.HasFlag(JfsFlags.Temporary)) sb.AppendLine("Volume does not commit to log");
if(jfsSb.s_flags.HasFlag(JfsFlags.InlineLog)) sb.AppendLine("Volume has log withing itself");
if(jfsSb.s_flags.HasFlag(JfsFlags.GroupCommit))
sb.AppendLine("Volume commits in groups of 1");
if(jfsSb.s_flags.HasFlag(JfsFlags.LazyCommit))
sb.AppendLine("Volume commits lazy");
if(jfsSb.s_flags.HasFlag(JfsFlags.Temporary))
sb.AppendLine("Volume does not commit to log");
if(jfsSb.s_flags.HasFlag(JfsFlags.InlineLog))
sb.AppendLine("Volume has log withing itself");
if(jfsSb.s_flags.HasFlag(JfsFlags.InlineMoving))
sb.AppendLine("Volume has log withing itself and is moving it out");
if(jfsSb.s_flags.HasFlag(JfsFlags.BadSAIT)) sb.AppendLine("Volume has bad current secondary ait");
if(jfsSb.s_flags.HasFlag(JfsFlags.Sparse)) sb.AppendLine("Volume supports sparse files");
if(jfsSb.s_flags.HasFlag(JfsFlags.DASDEnabled)) sb.AppendLine("Volume has DASD limits enabled");
if(jfsSb.s_flags.HasFlag(JfsFlags.DASDPrime)) sb.AppendLine("Volume primes DASD on boot");
if(jfsSb.s_flags.HasFlag(JfsFlags.SwapBytes)) sb.AppendLine("Volume is in a big-endian system");
if(jfsSb.s_flags.HasFlag(JfsFlags.DirIndex)) sb.AppendLine("Volume has presistent indexes");
if(jfsSb.s_flags.HasFlag(JfsFlags.Linux)) sb.AppendLine("Volume supports Linux");
if(jfsSb.s_flags.HasFlag(JfsFlags.DFS)) sb.AppendLine("Volume supports DCE DFS LFS");
if(jfsSb.s_flags.HasFlag(JfsFlags.OS2)) sb.AppendLine("Volume supports OS/2, and is case insensitive");
if(jfsSb.s_flags.HasFlag(JfsFlags.AIX)) sb.AppendLine("Volume supports AIX");
if(jfsSb.s_state != 0) sb.AppendLine("Volume is dirty");
if(jfsSb.s_flags.HasFlag(JfsFlags.BadSAIT))
sb.AppendLine("Volume has bad current secondary ait");
if(jfsSb.s_flags.HasFlag(JfsFlags.Sparse))
sb.AppendLine("Volume supports sparse files");
if(jfsSb.s_flags.HasFlag(JfsFlags.DASDEnabled))
sb.AppendLine("Volume has DASD limits enabled");
if(jfsSb.s_flags.HasFlag(JfsFlags.DASDPrime))
sb.AppendLine("Volume primes DASD on boot");
if(jfsSb.s_flags.HasFlag(JfsFlags.SwapBytes))
sb.AppendLine("Volume is in a big-endian system");
if(jfsSb.s_flags.HasFlag(JfsFlags.DirIndex))
sb.AppendLine("Volume has presistent indexes");
if(jfsSb.s_flags.HasFlag(JfsFlags.Linux))
sb.AppendLine("Volume supports Linux");
if(jfsSb.s_flags.HasFlag(JfsFlags.DFS))
sb.AppendLine("Volume supports DCE DFS LFS");
if(jfsSb.s_flags.HasFlag(JfsFlags.OS2))
sb.AppendLine("Volume supports OS/2, and is case insensitive");
if(jfsSb.s_flags.HasFlag(JfsFlags.AIX))
sb.AppendLine("Volume supports AIX");
if(jfsSb.s_state != 0)
sb.AppendLine("Volume is dirty");
sb.AppendFormat("Volume was last updated on {0}",
DateHandlers.UnixUnsignedToDateTime(jfsSb.s_time.tv_sec, jfsSb.s_time.tv_nsec))
.AppendLine();
DateHandlers.UnixUnsignedToDateTime(jfsSb.s_time.tv_sec, jfsSb.s_time.tv_nsec)).
AppendLine();
if(jfsSb.s_version == 1)
sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(jfsSb.s_fpack, Encoding)).AppendLine();
else sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(jfsSb.s_label, Encoding)).AppendLine();
else
sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(jfsSb.s_label, Encoding)).AppendLine();
sb.AppendFormat("Volume UUID: {0}", jfsSb.s_uuid).AppendLine();
XmlFsType = new FileSystemType
{
Type = "JFS filesystem",
Clusters = jfsSb.s_size,
ClusterSize = jfsSb.s_bsize,
Bootable = true,
Type = "JFS filesystem", Clusters = jfsSb.s_size, ClusterSize = jfsSb.s_bsize,
Bootable = true,
VolumeName =
StringHandlers.CToString(jfsSb.s_version == 1 ? jfsSb.s_fpack : jfsSb.s_label, Encoding),
VolumeSerial = $"{jfsSb.s_uuid}",
@@ -128,7 +181,9 @@ namespace Aaru.Filesystems
DateHandlers.UnixUnsignedToDateTime(jfsSb.s_time.tv_sec, jfsSb.s_time.tv_nsec),
ModificationDateSpecified = true
};
if(jfsSb.s_state != 0) XmlFsType.Dirty = true;
if(jfsSb.s_state != 0)
XmlFsType.Dirty = true;
information = sb.ToString();
}
@@ -136,47 +191,27 @@ namespace Aaru.Filesystems
[Flags]
enum JfsFlags : uint
{
Unicode = 0x00000001,
RemountRO = 0x00000002,
Continue = 0x00000004,
Panic = 0x00000008,
UserQuota = 0x00000010,
GroupQuota = 0x00000020,
NoJournal = 0x00000040,
Discard = 0x00000080,
GroupCommit = 0x00000100,
LazyCommit = 0x00000200,
Temporary = 0x00000400,
InlineLog = 0x00000800,
InlineMoving = 0x00001000,
BadSAIT = 0x00010000,
Sparse = 0x00020000,
DASDEnabled = 0x00040000,
DASDPrime = 0x00080000,
SwapBytes = 0x00100000,
DirIndex = 0x00200000,
Linux = 0x10000000,
DFS = 0x20000000,
OS2 = 0x40000000,
AIX = 0x80000000
Unicode = 0x00000001, RemountRO = 0x00000002, Continue = 0x00000004,
Panic = 0x00000008, UserQuota = 0x00000010, GroupQuota = 0x00000020,
NoJournal = 0x00000040, Discard = 0x00000080, GroupCommit = 0x00000100,
LazyCommit = 0x00000200, Temporary = 0x00000400, InlineLog = 0x00000800,
InlineMoving = 0x00001000, BadSAIT = 0x00010000, Sparse = 0x00020000,
DASDEnabled = 0x00040000, DASDPrime = 0x00080000, SwapBytes = 0x00100000,
DirIndex = 0x00200000, Linux = 0x10000000, DFS = 0x20000000,
OS2 = 0x40000000, AIX = 0x80000000
}
[Flags]
enum JfsState : uint
{
Clean = 0,
Mounted = 1,
Dirty = 2,
Logredo = 4,
Extendfs = 8
Clean = 0, Mounted = 1, Dirty = 2,
Logredo = 4, Extendfs = 8
}
[StructLayout(LayoutKind.Sequential, Pack = 1)]
struct JfsExtent
{
/// <summary>
/// Leftmost 24 bits are extent length, rest 8 bits are most significant for <see cref="addr2" />
/// </summary>
/// <summary>Leftmost 24 bits are extent length, rest 8 bits are most significant for <see cref="addr2" /></summary>
public readonly uint len_addr;
public readonly uint addr2;
}