diff --git a/FileSystemIDandChk/ImagePlugins/CDRWin.cs b/FileSystemIDandChk/ImagePlugins/CDRWin.cs index 59936c324..62648e544 100644 --- a/FileSystemIDandChk/ImagePlugins/CDRWin.cs +++ b/FileSystemIDandChk/ImagePlugins/CDRWin.cs @@ -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 = ""; } diff --git a/FileSystemIDandChk/ImagePlugins/DiskCopy42.cs b/FileSystemIDandChk/ImagePlugins/DiskCopy42.cs index 4e4f6d0a7..ac9227629 100644 --- a/FileSystemIDandChk/ImagePlugins/DiskCopy42.cs +++ b/FileSystemIDandChk/ImagePlugins/DiskCopy42.cs @@ -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"); } diff --git a/FileSystemIDandChk/Main.cs b/FileSystemIDandChk/Main.cs index 6b3546d39..11b385188 100644 --- a/FileSystemIDandChk/Main.cs +++ b/FileSystemIDandChk/Main.cs @@ -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"); diff --git a/FileSystemIDandChk/PartPlugins/MBR.cs b/FileSystemIDandChk/PartPlugins/MBR.cs index 653a24903..42b682c84 100644 --- a/FileSystemIDandChk/PartPlugins/MBR.cs +++ b/FileSystemIDandChk/PartPlugins/MBR.cs @@ -61,6 +61,9 @@ namespace FileSystemIDandChk.PartPlugins partitions = new List(); + if (imagePlugin.GetSectorSize() < 512) + return false; + byte[] sector = imagePlugin.ReadSector(0); signature = BitConverter.ToUInt16(sector, 0x1FE); diff --git a/FileSystemIDandChk/Plugins/FAT.cs b/FileSystemIDandChk/Plugins/FAT.cs index 7448d4ba4..f6dad359b 100644 --- a/FileSystemIDandChk/Plugins/FAT.cs +++ b/FileSystemIDandChk/Plugins/FAT.cs @@ -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(); diff --git a/FileSystemIDandChk/Plugins/ODS.cs b/FileSystemIDandChk/Plugins/ODS.cs index 99e7ae3e3..7978fc6ed 100644 --- a/FileSystemIDandChk/Plugins/ODS.cs +++ b/FileSystemIDandChk/Plugins/ODS.cs @@ -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);