aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

* DiscImageChef.Filesystems/UCSDPascal/Dir.cs:

Browse Source 
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.
This commit is contained in:
Natalia Portillo
2016-08-26 01:43:15 +01:00
parent 7465f306c0
commit f9bb6f25c8
21 changed files with 22580 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
DiscImageChef.DiscImages/CPCDSK.cs Normal file
View File

@@ -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()
{
}
}
}

4
DiscImageChef.DiscImages/ChangeLog
View File

@@ -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

4
DiscImageChef.DiscImages/ImagePlugin.cs
View File

@@ -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>

42
DiscImageChef.Filesystems/CPM/CPM.cs Normal file
View File

@@ -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()
{
}
}
}

42
DiscImageChef.Filesystems/CPM/Consts.cs Normal file
View File

@@ -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()
{
}
}
}

42
DiscImageChef.Filesystems/CPM/Definitions.cs Normal file
View File

@@ -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()
{
}
}
}

42
DiscImageChef.Filesystems/CPM/Dir.cs Normal file
View File

@@ -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()
{
}
}
}

42
DiscImageChef.Filesystems/CPM/File.cs Normal file
View File

@@ -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()
{
}
}
}

42
DiscImageChef.Filesystems/CPM/Info.cs Normal file
View File

@@ -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()
{
}
}
}

42
DiscImageChef.Filesystems/CPM/Structs.cs Normal file
View File

@@ -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()
{
}
}
}

42
DiscImageChef.Filesystems/CPM/Super.cs Normal file
View File

@@ -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()
{
}
}
}

42
DiscImageChef.Filesystems/CPM/Xattr.cs Normal file
View File

@@ -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()
{
}
}
}

22110
DiscImageChef.Filesystems/CPM/cpmdefs.xml Normal file
View File

File diff suppressed because it is too large Load Diff

4
DiscImageChef.Filesystems/ChangeLog
View File

@@ -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:

2
DiscImageChef.Filesystems/UCSDPascal/Dir.cs
View File

@@ -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 ] --------------------------------------------------------------
//

4
DiscImageChef.Helpers/ChangeLog
View File

@@ -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:

13
DiscImageChef.Helpers/DateHandlers.cs
View File

@@ -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;
}
}
}

2
DiscImageChef.Partitions/Acorn.cs
View File

@@ -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);

4
DiscImageChef.Partitions/ChangeLog
View File

@@ -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:

6
DiscImageChef/ChangeLog
View File

@@ -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:

14
DiscImageChef/Commands/ExtractFiles.cs
View File

@@ -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))