* DiscImageChef.Filesystems/UCSDPascal/Dir.cs:

Typo.

	* DiscImageChef.Helpers/DateHandlers.cs:
	  Added CP/M timestamp converter.

	* DiscImageChef.Partitions/Acorn.cs:
	  Corrected handling of negative values.

	* DiscImageChef/Commands/ExtractFiles.cs:
	  Corrected behaviour when volume name is missing, null or
	  empty.

	* DiscImageChef.DiscImages/ImagePlugin.cs:
	  Added floppy address mark sector tag.

DiscImageChef.DiscImages/CPCDSK.cs

@@ -0,0 +1,42 @@
+// /***************************************************************************
+// The Disc Image Chef
+// ----------------------------------------------------------------------------
+//
+// Filename       : CPCDSK.cs
+// Author(s)      : Natalia Portillo <claunia@claunia.com>
+//
+// Component      : Component
+//
+// --[ Description ] ----------------------------------------------------------
+//
+//     Description
+//
+// --[ License ] --------------------------------------------------------------
+//
+//     This library is free software; you can redistribute it and/or modify
+//     it under the terms of the GNU Lesser General Public License as
+//     published by the Free Software Foundation; either version 2.1 of the
+//     License, or (at your option) any later version.
+//
+//     This library is distributed in the hope that it will be useful, but
+//     WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//     Lesser General Public License for more details.
+//
+//     You should have received a copy of the GNU Lesser General Public
+//     License along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2011-2016 Natalia Portillo
+// ****************************************************************************/
+using System;
+namespace DiscImageChef.DiscImages
+{
+    public class CPCDSK
+    {
+        public CPCDSK()
+        {
+        }
+    }
+}
+

DiscImageChef.DiscImages/ChangeLog

@@ -1,3 +1,7 @@
+2016-08-26  Natalia Portillo  <claunia@claunia.com>
+
+	* ImagePlugin.cs: Added floppy address mark sector tag.
+
 2016-08-22  Natalia Portillo  <claunia@claunia.com>
 
 	* ZZZRawImage.cs: Detect X68000 SASI hard disks that use 256

DiscImageChef.DiscImages/ImagePlugin.cs

@@ -561,7 +561,9 @@ namespace DiscImageChef.ImagePlugins
         /// <summary>CD track flags, 1 byte</summary>
         CDTrackFlags,
         /// <summary>DVD sector copyright information</summary>
-        DVD_CMI
+        DVD_CMI,
+        /// <summary>Floppy address mark (contents depend on underlying floppy format)</summary>
+        FloppyAddressMark
     };
 
     /// <summary>

DiscImageChef.Filesystems/CPM/CPM.cs

@@ -0,0 +1,42 @@
+// /***************************************************************************
+// The Disc Image Chef
+// ----------------------------------------------------------------------------
+//
+// Filename       : CPM.cs
+// Author(s)      : Natalia Portillo <claunia@claunia.com>
+//
+// Component      : Component
+//
+// --[ Description ] ----------------------------------------------------------
+//
+//     Description
+//
+// --[ License ] --------------------------------------------------------------
+//
+//     This library is free software; you can redistribute it and/or modify
+//     it under the terms of the GNU Lesser General Public License as
+//     published by the Free Software Foundation; either version 2.1 of the
+//     License, or (at your option) any later version.
+//
+//     This library is distributed in the hope that it will be useful, but
+//     WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//     Lesser General Public License for more details.
+//
+//     You should have received a copy of the GNU Lesser General Public
+//     License along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2011-2016 Natalia Portillo
+// ****************************************************************************/
+using System;
+namespace DiscImageChef.Filesystems.CPM
+{
+    public class CPM
+    {
+        public CPM()
+        {
+        }
+    }
+}
+

DiscImageChef.Filesystems/CPM/Consts.cs

@@ -0,0 +1,42 @@
+// /***************************************************************************
+// The Disc Image Chef
+// ----------------------------------------------------------------------------
+//
+// Filename       : Consts.cs
+// Author(s)      : Natalia Portillo <claunia@claunia.com>
+//
+// Component      : Component
+//
+// --[ Description ] ----------------------------------------------------------
+//
+//     Description
+//
+// --[ License ] --------------------------------------------------------------
+//
+//     This library is free software; you can redistribute it and/or modify
+//     it under the terms of the GNU Lesser General Public License as
+//     published by the Free Software Foundation; either version 2.1 of the
+//     License, or (at your option) any later version.
+//
+//     This library is distributed in the hope that it will be useful, but
+//     WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//     Lesser General Public License for more details.
+//
+//     You should have received a copy of the GNU Lesser General Public
+//     License along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2011-2016 Natalia Portillo
+// ****************************************************************************/
+using System;
+namespace DiscImageChef.Filesystems.CPM
+{
+    public class Consts
+    {
+        public Consts()
+        {
+        }
+    }
+}
+

DiscImageChef.Filesystems/CPM/Definitions.cs

@@ -0,0 +1,42 @@
+// /***************************************************************************
+// The Disc Image Chef
+// ----------------------------------------------------------------------------
+//
+// Filename       : Definitions.cs
+// Author(s)      : Natalia Portillo <claunia@claunia.com>
+//
+// Component      : Component
+//
+// --[ Description ] ----------------------------------------------------------
+//
+//     Description
+//
+// --[ License ] --------------------------------------------------------------
+//
+//     This library is free software; you can redistribute it and/or modify
+//     it under the terms of the GNU Lesser General Public License as
+//     published by the Free Software Foundation; either version 2.1 of the
+//     License, or (at your option) any later version.
+//
+//     This library is distributed in the hope that it will be useful, but
+//     WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//     Lesser General Public License for more details.
+//
+//     You should have received a copy of the GNU Lesser General Public
+//     License along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2011-2016 Natalia Portillo
+// ****************************************************************************/
+using System;
+namespace DiscImageChef.Filesystems.CPM
+{
+    public class Definitions
+    {
+        public Definitions()
+        {
+        }
+    }
+}
+

DiscImageChef.Filesystems/CPM/Dir.cs

@@ -0,0 +1,42 @@
+// /***************************************************************************
+// The Disc Image Chef
+// ----------------------------------------------------------------------------
+//
+// Filename       : Dir.cs
+// Author(s)      : Natalia Portillo <claunia@claunia.com>
+//
+// Component      : Component
+//
+// --[ Description ] ----------------------------------------------------------
+//
+//     Description
+//
+// --[ License ] --------------------------------------------------------------
+//
+//     This library is free software; you can redistribute it and/or modify
+//     it under the terms of the GNU Lesser General Public License as
+//     published by the Free Software Foundation; either version 2.1 of the
+//     License, or (at your option) any later version.
+//
+//     This library is distributed in the hope that it will be useful, but
+//     WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//     Lesser General Public License for more details.
+//
+//     You should have received a copy of the GNU Lesser General Public
+//     License along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2011-2016 Natalia Portillo
+// ****************************************************************************/
+using System;
+namespace DiscImageChef.Filesystems.CPM
+{
+    public class Dir
+    {
+        public Dir()
+        {
+        }
+    }
+}
+

DiscImageChef.Filesystems/CPM/File.cs

@@ -0,0 +1,42 @@
+// /***************************************************************************
+// The Disc Image Chef
+// ----------------------------------------------------------------------------
+//
+// Filename       : File.cs
+// Author(s)      : Natalia Portillo <claunia@claunia.com>
+//
+// Component      : Component
+//
+// --[ Description ] ----------------------------------------------------------
+//
+//     Description
+//
+// --[ License ] --------------------------------------------------------------
+//
+//     This library is free software; you can redistribute it and/or modify
+//     it under the terms of the GNU Lesser General Public License as
+//     published by the Free Software Foundation; either version 2.1 of the
+//     License, or (at your option) any later version.
+//
+//     This library is distributed in the hope that it will be useful, but
+//     WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//     Lesser General Public License for more details.
+//
+//     You should have received a copy of the GNU Lesser General Public
+//     License along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2011-2016 Natalia Portillo
+// ****************************************************************************/
+using System;
+namespace DiscImageChef.Filesystems.CPM
+{
+    public class File
+    {
+        public File()
+        {
+        }
+    }
+}
+

DiscImageChef.Filesystems/CPM/Info.cs

@@ -0,0 +1,42 @@
+// /***************************************************************************
+// The Disc Image Chef
+// ----------------------------------------------------------------------------
+//
+// Filename       : Info.cs
+// Author(s)      : Natalia Portillo <claunia@claunia.com>
+//
+// Component      : Component
+//
+// --[ Description ] ----------------------------------------------------------
+//
+//     Description
+//
+// --[ License ] --------------------------------------------------------------
+//
+//     This library is free software; you can redistribute it and/or modify
+//     it under the terms of the GNU Lesser General Public License as
+//     published by the Free Software Foundation; either version 2.1 of the
+//     License, or (at your option) any later version.
+//
+//     This library is distributed in the hope that it will be useful, but
+//     WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//     Lesser General Public License for more details.
+//
+//     You should have received a copy of the GNU Lesser General Public
+//     License along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2011-2016 Natalia Portillo
+// ****************************************************************************/
+using System;
+namespace DiscImageChef.Filesystems.CPM
+{
+    public class Info
+    {
+        public Info()
+        {
+        }
+    }
+}
+

DiscImageChef.Filesystems/CPM/Structs.cs

@@ -0,0 +1,42 @@
+// /***************************************************************************
+// The Disc Image Chef
+// ----------------------------------------------------------------------------
+//
+// Filename       : Structs.cs
+// Author(s)      : Natalia Portillo <claunia@claunia.com>
+//
+// Component      : Component
+//
+// --[ Description ] ----------------------------------------------------------
+//
+//     Description
+//
+// --[ License ] --------------------------------------------------------------
+//
+//     This library is free software; you can redistribute it and/or modify
+//     it under the terms of the GNU Lesser General Public License as
+//     published by the Free Software Foundation; either version 2.1 of the
+//     License, or (at your option) any later version.
+//
+//     This library is distributed in the hope that it will be useful, but
+//     WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//     Lesser General Public License for more details.
+//
+//     You should have received a copy of the GNU Lesser General Public
+//     License along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2011-2016 Natalia Portillo
+// ****************************************************************************/
+using System;
+namespace DiscImageChef.Filesystems.CPM
+{
+    public class Structs
+    {
+        public Structs()
+        {
+        }
+    }
+}
+

DiscImageChef.Filesystems/CPM/Super.cs

@@ -0,0 +1,42 @@
+// /***************************************************************************
+// The Disc Image Chef
+// ----------------------------------------------------------------------------
+//
+// Filename       : Super.cs
+// Author(s)      : Natalia Portillo <claunia@claunia.com>
+//
+// Component      : Component
+//
+// --[ Description ] ----------------------------------------------------------
+//
+//     Description
+//
+// --[ License ] --------------------------------------------------------------
+//
+//     This library is free software; you can redistribute it and/or modify
+//     it under the terms of the GNU Lesser General Public License as
+//     published by the Free Software Foundation; either version 2.1 of the
+//     License, or (at your option) any later version.
+//
+//     This library is distributed in the hope that it will be useful, but
+//     WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//     Lesser General Public License for more details.
+//
+//     You should have received a copy of the GNU Lesser General Public
+//     License along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2011-2016 Natalia Portillo
+// ****************************************************************************/
+using System;
+namespace DiscImageChef.Filesystems.CPM
+{
+    public class Super
+    {
+        public Super()
+        {
+        }
+    }
+}
+

DiscImageChef.Filesystems/CPM/Xattr.cs

@@ -0,0 +1,42 @@
+// /***************************************************************************
+// The Disc Image Chef
+// ----------------------------------------------------------------------------
+//
+// Filename       : Xattr.cs
+// Author(s)      : Natalia Portillo <claunia@claunia.com>
+//
+// Component      : Component
+//
+// --[ Description ] ----------------------------------------------------------
+//
+//     Description
+//
+// --[ License ] --------------------------------------------------------------
+//
+//     This library is free software; you can redistribute it and/or modify
+//     it under the terms of the GNU Lesser General Public License as
+//     published by the Free Software Foundation; either version 2.1 of the
+//     License, or (at your option) any later version.
+//
+//     This library is distributed in the hope that it will be useful, but
+//     WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//     Lesser General Public License for more details.
+//
+//     You should have received a copy of the GNU Lesser General Public
+//     License along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2011-2016 Natalia Portillo
+// ****************************************************************************/
+using System;
+namespace DiscImageChef.Filesystems.CPM
+{
+    public class Xattr
+    {
+        public Xattr()
+        {
+        }
+    }
+}
+

DiscImageChef.Filesystems/ChangeLog

@@ -1,3 +1,7 @@
+2016-08-26  Natalia Portillo  <claunia@claunia.com>
+
+	* Dir.cs: Typo.
+
 2016-08-21  Natalia Portillo  <claunia@claunia.com>
 
 	* Dir.cs:

DiscImageChef.Filesystems/UCSDPascal/Dir.cs

@@ -9,7 +9,7 @@
 //
 // --[ Description ] ----------------------------------------------------------
 //
-//     Methods to handle show the U.C.S.D. Pascal catalog as a directory.
+//     Methods to show the U.C.S.D. Pascal catalog as a directory.
 //
 // --[ License ] --------------------------------------------------------------
 //

DiscImageChef.Helpers/ChangeLog

@@ -1,3 +1,7 @@
+2016-08-26  Natalia Portillo  <claunia@claunia.com>
+
+	* DateHandlers.cs: Added CP/M timestamp converter.
+
 2016-08-22  Natalia Portillo  <claunia@claunia.com>
 
 	* BigEndianMarshal.cs:

DiscImageChef.Helpers/DateHandlers.cs

@@ -164,6 +164,19 @@ namespace DiscImageChef
             DicConsole.DebugWriteLine("DOSToDateTime handler", "time = 0x{0:X4}, hour = {1}, minute = {2}, second = {3}", time, hour, minute, second);
             return new DateTime(year, month, day, hour, minute, second);
         }
+
+        public static DateTime CPMToDateTime(byte[] timestamp)
+        {
+            ushort days = BitConverter.ToUInt16(timestamp, 0);
+            int hours = timestamp[2];
+            int minutes = timestamp[3];
+
+            DateTime temp = AmigaEpoch.AddDays(days);
+            temp = temp.AddHours(hours);
+            temp = temp.AddMinutes(minutes);
+
+            return temp;
+        }
     }
 }
 

DiscImageChef.Partitions/Acorn.cs

@@ -86,7 +86,7 @@ namespace DiscImageChef.PartPlugins
             int secCyl = bootBlock.discRecords.spt * heads;
             int mapSector = bootBlock.startCylinder * secCyl;
 
-            if(mapSector >= (int)imagePlugin.GetSectors())
+            if((ulong)mapSector >= imagePlugin.GetSectors())
                 return false;
 
             byte[] map = imagePlugin.ReadSector((ulong)mapSector);

DiscImageChef.Partitions/ChangeLog

@@ -1,3 +1,7 @@
+2016-08-26  Natalia Portillo  <claunia@claunia.com>
+
+	* Acorn.cs: Corrected handling of negative values.
+
 2016-08-22  Natalia Portillo  <claunia@claunia.com>
 
 	* Human68k.cs:

DiscImageChef/ChangeLog

@@ -1,3 +1,9 @@
+2016-08-26  Natalia Portillo  <claunia@claunia.com>
+
+	* Commands/ExtractFiles.cs:
+	  Corrected behaviour when volume name is missing, null or
+	  empty.
+
 2016-08-18  Natalia Portillo  <claunia@claunia.com>
 
 	* Commands/Compare.cs:

DiscImageChef/Commands/ExtractFiles.cs

@@ -259,6 +259,12 @@ namespace DiscImageChef.Commands
                                 string outputPath;
                                 FileStream outputFile;
 
+                                string volumeName;
+                                if(string.IsNullOrEmpty(fs.XmlFSType.VolumeName))
+                                    volumeName = "NO NAME";
+                                else
+                                    volumeName = fs.XmlFSType.VolumeName;
+
                                 error = fs.Stat(entry, ref stat);
                                 if(error == Errno.NoError)
                                 {
@@ -277,13 +283,13 @@ namespace DiscImageChef.Commands
                                                 {
                                                     Directory.CreateDirectory(Path.Combine(options.OutputDir,
                                                                                            fs.XmlFSType.Type,
-                                                                                           fs.XmlFSType.VolumeName,
+                                                                                           volumeName,
                                                                                            ".xattrs",
                                                                                            xattr));
 
                                                     outputPath = Path.Combine(options.OutputDir,
                                                                                     fs.XmlFSType.Type,
-                                                                                    fs.XmlFSType.VolumeName,
+                                                                                    volumeName,
                                                                                     ".xattrs",
                                                                                     xattr,
                                                                                      entry);
@@ -314,11 +320,11 @@ namespace DiscImageChef.Commands
 
                                     Directory.CreateDirectory(Path.Combine(options.OutputDir,
                                                                            fs.XmlFSType.Type,
-                                                                           fs.XmlFSType.VolumeName));
+                                                                           volumeName));
 
                                     outputPath = Path.Combine(options.OutputDir,
                                                                     fs.XmlFSType.Type,
-                                                                    fs.XmlFSType.VolumeName,
+                                                              volumeName,
                                                                      entry);
 
                                     if(!File.Exists(outputPath))