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

Solved incorrect filename decoding in LisaFS.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-07 00:00:45 +00:00
parent 4cd0ec53e9
commit 02dc84e951
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,7 +97,7 @@ namespace DiscImageChef.Filesystems.LisaFS
if(entry.parentID == dirId) if(entry.parentID == dirId)
// Do same trick as Mac OS X, replace filesystem '/' with '-', // Do same trick as Mac OS X, replace filesystem '/' with '-',
// as '-' is the path separator in Lisa OS // as '-' is the path separator in Lisa OS
contents.Add(CurrentEncoding.GetString(entry.filename).Replace('/', '-')); contents.Add(StringHandlers.CToString(entry.filename, CurrentEncoding).Replace('/', '-'));
} }
return Errno.NoError; return Errno.NoError;

2
DiscImageChef.Filesystems/LisaFS/Extent.cs
View File

@@ -196,7 +196,7 @@ namespace DiscImageChef.Filesystems.LisaFS
if(!printedExtents.Contains(fileId)) if(!printedExtents.Contains(fileId))
{ {
DicConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].filenameLen = {1}", fileId, file.filenameLen); DicConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].filenameLen = {1}", fileId, file.filenameLen);
DicConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].filename = {1}", fileId, CurrentEncoding.GetString(file.filename)); DicConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].filename = {1}", fileId, StringHandlers.CToString(file.filename, CurrentEncoding));
DicConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown1 = 0x{1:X4}", fileId, file.unknown1); DicConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown1 = 0x{1:X4}", fileId, file.unknown1);
DicConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].file_uid = 0x{1:X16}", fileId, file.file_uid); DicConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].file_uid = 0x{1:X16}", fileId, file.file_uid);
DicConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown2 = 0x{1:X2}", fileId, file.unknown2); DicConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown2 = 0x{1:X2}", fileId, file.unknown2);

2
DiscImageChef.Filesystems/LisaFS/File.cs
View File

@@ -504,7 +504,7 @@ namespace DiscImageChef.Filesystems.LisaFS
foreach(CatalogEntry entry in catalogCache) foreach(CatalogEntry entry in catalogCache)
{ {
string filename = CurrentEncoding.GetString(entry.filename); string filename = StringHandlers.CToString(entry.filename, CurrentEncoding);
// LisaOS is case insensitive // LisaOS is case insensitive
if(string.Compare(wantedFilename, filename, StringComparison.InvariantCultureIgnoreCase) == 0 if(string.Compare(wantedFilename, filename, StringComparison.InvariantCultureIgnoreCase) == 0