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

Implement DOS and NT namespaces in FAT.

Browse Source
This commit is contained in:
Natalia Portillo
2019-04-27 02:46:29 +01:00
parent 5b86a572bd
commit 7a8e997948
4 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DiscImageChef.Filesystems/FAT/Consts.cs
View File

@@ -205,5 +205,11 @@ namespace DiscImageChef.Filesystems.FAT
DecRainbow,
Human
}
enum Namespace
{
Dos,
Nt
}
}
}

11
DiscImageChef.Filesystems/FAT/Dir.cs
View File

@@ -154,11 +154,14 @@ namespace DiscImageChef.Filesystems.FAT
string name = Encoding.GetString(dirent.filename).TrimEnd();
string extension = Encoding.GetString(dirent.extension).TrimEnd();
if((dirent.caseinfo & FASTFAT_LOWERCASE_EXTENSION) > 0)
extension = extension.ToLower(CultureInfo.CurrentCulture);
if(@namespace == Namespace.Nt)
{
if((dirent.caseinfo & FASTFAT_LOWERCASE_EXTENSION) > 0)
extension = extension.ToLower(CultureInfo.CurrentCulture);
if((dirent.caseinfo & FASTFAT_LOWERCASE_BASENAME) > 0)
name = name.ToLower(CultureInfo.CurrentCulture);
if((dirent.caseinfo & FASTFAT_LOWERCASE_BASENAME) > 0)
name = name.ToLower(CultureInfo.CurrentCulture);
}
if(extension != "") filename = name + "." + extension;
else filename = name;

7
DiscImageChef.Filesystems/FAT/FAT.cs
View File

@@ -55,6 +55,7 @@ namespace DiscImageChef.Filesystems.FAT
ulong fatFirstSector;
ulong firstClusterSector;
bool mounted;
Namespace @namespace;
uint reservedSectors;
Dictionary<string, DirectoryEntry> rootDirectoryCache;
uint sectorsPerCluster;
@@ -72,7 +73,11 @@ namespace DiscImageChef.Filesystems.FAT
public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
new (string name, Type type, string description)[] { };
public Dictionary<string, string> Namespaces => null;
public Dictionary<string, string> Namespaces =>
new Dictionary<string, string>
{
{"dos", "DOS (8.3 all uppercase)"}, {"nt", "Windows NT (8.3 mixed case, default)"}
};
static Dictionary<string, string> GetDefaultOptions() =>
new Dictionary<string, string> {{"debug", false.ToString()}};

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

@@ -65,6 +65,20 @@ namespace DiscImageChef.Filesystems.FAT
if(options == null) options = GetDefaultOptions();
if(options.TryGetValue("debug", out string debugString)) bool.TryParse(debugString, out debug);
// Default namespace
if(@namespace is null) @namespace = "nt";
switch(@namespace.ToLowerInvariant())
{
case "dos":
this.@namespace = Namespace.Dos;
break;
case "nt":
this.@namespace = Namespace.Nt;
break;
default: return Errno.InvalidArgument;
}
if(imagePlugin.Info.SectorSize < 512) return Errno.InvalidArgument;
DicConsole.DebugWriteLine("FAT plugin", "Reading BPB");
@@ -414,7 +428,9 @@ namespace DiscImageChef.Filesystems.FAT
Array.Copy(entry.extension, 0, fullname, 8, 3);
string volname = Encoding.GetString(fullname).Trim();
if(!string.IsNullOrEmpty(volname))
XmlFsType.VolumeName = (entry.caseinfo & 0x18) > 0 ? volname.ToLower() : volname;
XmlFsType.VolumeName = (entry.caseinfo & 0x18) > 0 && this.@namespace == Namespace.Nt
? volname.ToLower()
: volname;
if(entry.ctime > 0 && entry.cdate > 0)
{
@@ -438,10 +454,14 @@ namespace DiscImageChef.Filesystems.FAT
string name = Encoding.GetString(entry.filename).TrimEnd();
string extension = Encoding.GetString(entry.extension).TrimEnd();
if((entry.caseinfo & FASTFAT_LOWERCASE_EXTENSION) > 0)
extension = extension.ToLower(CultureInfo.CurrentCulture);
if(this.@namespace == Namespace.Nt)
{
if((entry.caseinfo & FASTFAT_LOWERCASE_EXTENSION) > 0)
extension = extension.ToLower(CultureInfo.CurrentCulture);
if((entry.caseinfo & FASTFAT_LOWERCASE_BASENAME) > 0) name = name.ToLower(CultureInfo.CurrentCulture);
if((entry.caseinfo & FASTFAT_LOWERCASE_BASENAME) > 0)
name = name.ToLower(CultureInfo.CurrentCulture);
}
if(extension != "") filename = name + "." + extension;
else filename = name;