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

Add support for Human68k 18.3 filenames in FAT.

Browse Source
This commit is contained in:
Natalia Portillo
2019-04-28 18:12:44 +01:00
parent baf6f46eb2
commit 2d660035a9
5 changed files with 94 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
DiscImageChef.Filesystems/FAT/Super.cs
View File

@@ -60,7 +60,6 @@ namespace DiscImageChef.Filesystems.FAT
public Errno Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
Dictionary<string, string> options, string @namespace)
{
Encoding = encoding ?? Encoding.GetEncoding("IBM437");
XmlFsType = new FileSystemType();
if(options == null) options = GetDefaultOptions();
if(options.TryGetValue("debug", out string debugString)) bool.TryParse(debugString, out debug);
@@ -85,6 +84,9 @@ namespace DiscImageChef.Filesystems.FAT
case "lfn":
this.@namespace = Namespace.Lfn;
break;
case "human":
this.@namespace = Namespace.Human;
break;
default: return Errno.InvalidArgument;
}
@@ -227,10 +229,21 @@ namespace DiscImageChef.Filesystems.FAT
}
case BpbKind.Human:
// If not debug set Human68k namespace and ShiftJIS codepage as defaults
if(!debug)
{
this.@namespace = Namespace.Human;
encoding = Encoding.GetEncoding("shift_jis");
}
XmlFsType.Bootable = true;
break;
}
Encoding = encoding ?? (bpbKind == BpbKind.Human
? Encoding.GetEncoding("shift_jis")
: Encoding.GetEncoding("IBM437"));
ulong firstRootSector = 0;
if(!fat32)
@@ -527,6 +540,26 @@ namespace DiscImageChef.Filesystems.FAT
completeEntry.Shortname = filename;
if(this.@namespace == Namespace.Human)
{
HumanDirectoryEntry humanEntry =
Marshal.ByteArrayToStructureLittleEndian<HumanDirectoryEntry>(rootDirectory, i,
Marshal
.SizeOf<HumanDirectoryEntry
>());
completeEntry.HumanDirent = humanEntry;
name = StringHandlers.CToString(humanEntry.name1, Encoding).TrimEnd();
extension = StringHandlers.CToString(humanEntry.extension, Encoding).TrimEnd();
string name2 = StringHandlers.CToString(humanEntry.name2, Encoding).TrimEnd();
if(extension != "") filename = name + name2 + "." + extension;
else filename = name + name2;
completeEntry.HumanName = filename;
}
if(!fat32 && filename == "EA DATA. SF")
{
eaDirEntry = entry;
@@ -699,8 +732,6 @@ namespace DiscImageChef.Filesystems.FAT
}
}
System.Console.WriteLine("First cluster sector: {0}", firstClusterSector);
System.Console.WriteLine("Sectors per cluster: {0}", sectorsPerCluster);
mounted = true;
return Errno.NoError;
}