From 0dbb583d1a9ffb10ede17d694bd20a74e15ee348 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sat, 11 Apr 2026 09:22:12 +0100 Subject: [PATCH] Fix use of wrong xattr names for analyze command. --- Aaru.Filesystems/AppleHFS/Analyze.cs | 2 +- Aaru.Filesystems/AppleHFSPlus/Analyze.cs | 2 +- Aaru.Filesystems/AppleMFS/Analyze.cs | 11 +++++++++-- Aaru.Filesystems/ISO9660/Analyze.cs | 11 ++++++++--- Aaru.Filesystems/ProDOS/Analyze.cs | 2 +- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Aaru.Filesystems/AppleHFS/Analyze.cs b/Aaru.Filesystems/AppleHFS/Analyze.cs index 96e791366..bb2906497 100644 --- a/Aaru.Filesystems/AppleHFS/Analyze.cs +++ b/Aaru.Filesystems/AppleHFS/Analyze.cs @@ -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, diff --git a/Aaru.Filesystems/AppleHFSPlus/Analyze.cs b/Aaru.Filesystems/AppleHFSPlus/Analyze.cs index 522dd0438..c781cd357 100644 --- a/Aaru.Filesystems/AppleHFSPlus/Analyze.cs +++ b/Aaru.Filesystems/AppleHFSPlus/Analyze.cs @@ -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, diff --git a/Aaru.Filesystems/AppleMFS/Analyze.cs b/Aaru.Filesystems/AppleMFS/Analyze.cs index fa4c4323b..5f6016f7c 100644 --- a/Aaru.Filesystems/AppleMFS/Analyze.cs +++ b/Aaru.Filesystems/AppleMFS/Analyze.cs @@ -93,8 +93,15 @@ public sealed partial class AppleMFS void AddOverlappingFile(string path, FileEntry entry, IReadOnlyList<(ulong Start, ulong End)> sectorExtents, List 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, diff --git a/Aaru.Filesystems/ISO9660/Analyze.cs b/Aaru.Filesystems/ISO9660/Analyze.cs index b1ee750c4..15101df76 100644 --- a/Aaru.Filesystems/ISO9660/Analyze.cs +++ b/Aaru.Filesystems/ISO9660/Analyze.cs @@ -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; diff --git a/Aaru.Filesystems/ProDOS/Analyze.cs b/Aaru.Filesystems/ProDOS/Analyze.cs index 29afe7121..90b432e8a 100644 --- a/Aaru.Filesystems/ProDOS/Analyze.cs +++ b/Aaru.Filesystems/ProDOS/Analyze.cs @@ -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,