From 428e5432e4eed5a713de0f400f7dad73dbfab307 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Tue, 13 Oct 2015 01:45:07 +0100
Subject: [PATCH] 	* DiscImageChef/Main.cs: 	*
 DiscImageChef/Options.cs: 	* DiscImageChef/DiscImageChef.csproj: 	*
 DiscImageChef/Commands/DeviceInfo.cs: 	  Added "device-info" command.

	* DiscImageChef.Decoders/SCSI.cs:
	  Correct size miscalculation.
	Do not print "Device claims no standard", generates too much
	  noise.

	* DiscImageChef.Devices/Device/Constructor.cs:
	  Add OS error detection and handling.
	On Linux move to opening O_RDONLY and O_NONBLOCK to allow
	  opening read-only media and removable drives without media.

	* DiscImageChef.Devices/Device/Variables.cs:
	* DiscImageChef.Devices/Device/ScsiCommands.cs:
	  Add OS error detection and handling.

	* DiscImageChef.Devices/DiscImageChef.Devices.csproj:
	* DiscImageChef.Interop/DiscImageChef.Interop.csproj:
	  Downgraded .NET version.
---
 ChangeLog | 7 +++++++
 SCSI.cs   | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 95be0c1..63aa2ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-13  Natalia Portillo  <claunia@claunia.com>
+
+	* SCSI.cs:
+	  Correct size miscalculation.
+	Do not print "Device claims no standard", generates too much
+	  noise.
+
 2015-10-05  Natalia Portillo  <claunia@claunia.com>
 
 	* CD.cs:
diff --git a/SCSI.cs b/SCSI.cs
index a331baa..39a365e 100644
--- a/SCSI.cs
+++ b/SCSI.cs
@@ -2493,7 +2493,7 @@ namespace DiscImageChef.Decoders
                     return null;
             }
 
-            if (SCSIInquiryResponse.Length != SCSIInquiryResponse[4] + 4)
+            if (SCSIInquiryResponse.Length != SCSIInquiryResponse[4] + 5)
             {
                 //if (MainClass.isDebug)
                     Console.WriteLine("DEBUG (SCSI INQUIRY Decoder): INQUIRY response length ({0} bytes) is different than specified in length field ({1} bytes), decoded data can be incorrect, proceeding anyway.", SCSIInquiryResponse.Length, SCSIInquiryResponse[4] + 4);
@@ -2873,7 +2873,7 @@ namespace DiscImageChef.Decoders
                         switch (VersionDescriptor & 0x001F)
                         {
                             case 0x00:
-                                sb.AppendLine("Device claims no standard");
+                                //sb.AppendLine("Device claims no standard");
                                 break;
                             default:
                                 sb.AppendFormat("Device claims unknown version 0x{0:X2} of no standard", VersionDescriptor & 0x001F).AppendLine();