aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2026-07-08 18:16:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix use of wrong xattr names for analyze command.

Browse Source
This commit is contained in:
Natalia Portillo
2026-04-11 09:22:12 +01:00
parent d541782190
commit 0dbb583d1a
5 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.Filesystems/AppleHFS/Analyze.cs
View File

@@ -147,7 +147,7 @@ public sealed partial class AppleHFS
if(fileEntry.ResourceForkLogicalSize == 0) return ErrorNumber.NoError;
return AddForkOverlaps(path,
"resource-fork",
Xattrs.XATTR_APPLE_RESOURCE_FORK,
fileEntry.CNID,
ForkType.Resource,
fileEntry.ResourceForkLogicalSize,

2
Aaru.Filesystems/AppleHFSPlus/Analyze.cs
View File

@@ -167,7 +167,7 @@ public sealed partial class AppleHFSPlus
if(resourceErr != ErrorNumber.NoError) return resourceErr;
return AddForkOverlaps(path,
"resource-fork",
Xattrs.XATTR_APPLE_RESOURCE_FORK,
fileEntry.CNID,
fileEntry.ResourceForkLogicalSize,
resourceExtents,

11
Aaru.Filesystems/AppleMFS/Analyze.cs
View File

@@ -93,8 +93,15 @@ public sealed partial class AppleMFS
void AddOverlappingFile(string path, FileEntry entry, IReadOnlyList<(ulong Start, ulong End)> sectorExtents,
List<FileSectorInfo> files)
{
AddOverlappingFork(path, null, entry.flFlNum, entry.flStBlk, entry.flLgLen, sectorExtents, files);
AddOverlappingFork(path, "resource-fork", entry.flFlNum, entry.flRStBlk, entry.flRLgLen, sectorExtents, files);
AddOverlappingFork(path, null, entry.flFlNum, entry.flStBlk, entry.flLgLen, sectorExtents, files);
AddOverlappingFork(path,
Xattrs.XATTR_APPLE_RESOURCE_FORK,
entry.flFlNum,
entry.flRStBlk,
entry.flRLgLen,
sectorExtents,
files);
}
void AddOverlappingFork(string path, string stream, uint fileId, ushort startBlock, uint logicalLength,

11
Aaru.Filesystems/ISO9660/Analyze.cs
View File

@@ -121,9 +121,14 @@ public sealed partial class ISO9660
continue;
}
AddOverlappingFile(entryPath, null, entry, sectorExtents, files);
AddOverlappingFile(entryPath, "resource-fork", entry.ResourceFork, sectorExtents, files);
AddOverlappingFile(entryPath, "associated-file", entry.AssociatedFile, sectorExtents, files);
AddOverlappingFile(entryPath, null, entry, sectorExtents, files);
AddOverlappingFile(entryPath, Xattrs.XATTR_APPLE_RESOURCE_FORK, entry.ResourceFork, sectorExtents, files);
AddOverlappingFile(entryPath,
Xattrs.XATTR_ISO9660_ASSOCIATED_FILE,
entry.AssociatedFile,
sectorExtents,
files);
}
return ErrorNumber.NoError;

2
Aaru.Filesystems/ProDOS/Analyze.cs
View File

@@ -179,7 +179,7 @@ public sealed partial class ProDOSPlugin
extKeyBlock.resource_fork.eof[2] << 16);
return AddForkOverlaps(path,
"resource-fork",
Xattrs.XATTR_APPLE_RESOURCE_FORK,
entry.KeyBlock,
resourceStorageType,
extKeyBlock.resource_fork.key_block,