* FileSystemIDandChk/ImagePlugins/CDRWin.cs:

* FileSystemIDandChk/ImagePlugins/DiskCopy42.cs:
	  No need to call them "handler"s.

	* FileSystemIDandChk/Main.cs:
	  DEBUG lines should only appear while on debug mode

	* FileSystemIDandChk/PartPlugins/MBR.cs:
	  Do not check MBR presence on less than 512 bytes/sector
	  disks

	* FileSystemIDandChk/Plugins/FAT.cs:
	  Get cleaner output, add newline.

	* FileSystemIDandChk/Plugins/ODS.cs:
	  Do not check FILES-11 (ODS) presence on less than 512
	  bytes/sector disks
This commit is contained in:
2014-06-07 17:32:14 +01:00
parent 088a8dd141
commit 922c028b12
6 changed files with 11 additions and 4 deletions

View File

@@ -288,7 +288,7 @@ namespace FileSystemIDandChk.ImagePlugins
public CDRWin(PluginBase Core)
{
Name = "CDRWin cuesheet handler";
Name = "CDRWin cuesheet";
PluginUUID = new Guid("664568B2-15D4-4E64-8A7A-20BDA8B8386F");
imagePath = "";
}

View File

@@ -132,7 +132,7 @@ namespace FileSystemIDandChk.ImagePlugins
public DiskCopy42(PluginBase Core)
{
Name = "Apple DiskCopy 4.2 handler";
Name = "Apple DiskCopy 4.2";
PluginUUID = new Guid("0240B7B1-E959-4CDC-B0BD-386D6E467B88");
}

View File

@@ -207,7 +207,8 @@ namespace FileSystemIDandChk
if (partition_scheme == "")
{
Console.WriteLine("DEBUG: No partitions found");
if(MainClass.isDebug)
Console.WriteLine("DEBUG: No partitions found");
if (!chkFilesystems)
{
Console.WriteLine("No partitions founds, not searching for filesystems");

View File

@@ -61,6 +61,9 @@ namespace FileSystemIDandChk.PartPlugins
partitions = new List<Partition>();
if (imagePlugin.GetSectorSize() < 512)
return false;
byte[] sector = imagePlugin.ReadSector(0);
signature = BitConverter.ToUInt16(sector, 0x1FE);

View File

@@ -342,7 +342,7 @@ namespace FileSystemIDandChk.Plugins
sb.AppendLine("Pre-DOS 2.0 Microsoft FAT12.");
sb.AppendLine("***WARNING***");
sb.AppendLine("This may be a false positive.");
sb.AppendFormat("Disk image identifies disk type as {0}.", imagePlugin.GetDiskType());
sb.AppendFormat("Disk image identifies disk type as {0}.", imagePlugin.GetDiskType()).AppendLine();
}
information = sb.ToString();

View File

@@ -60,6 +60,9 @@ namespace FileSystemIDandChk.Plugins
public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionOffset)
{
if (imagePlugin.GetSectorSize() < 512)
return false;
byte[] magic_b = new byte[12];
string magic;
byte[] hb_sector = imagePlugin.ReadSector(1 + partitionOffset);