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

Replace Read method with ReadFile method that uses the file node in IFileSystem.

Browse Source
This commit is contained in:
Natalia Portillo
2022-12-19 11:03:51 +00:00
parent 0fc479a529
commit b4b2868c22
18 changed files with 1780 additions and 1271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Aaru.Filesystems/AppleDOS/File.cs
View File

@@ -145,57 +145,28 @@ public sealed partial class AppleDOS
}
/// <inheritdoc />
public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
public ErrorNumber ReadFile(IFileNode node, long length, byte[] buffer, out long read)
{
read = 0;
if(!_mounted)
return ErrorNumber.AccessDenied;
string[] pathElements = path.Split(new[]
{
'/'
}, StringSplitOptions.RemoveEmptyEntries);
if(pathElements.Length != 1)
return ErrorNumber.NotSupported;
byte[] file;
string filename = pathElements[0].ToUpperInvariant();
if(filename.Length > 30)
return ErrorNumber.NameTooLong;
if(_debug && (string.Compare(path, "$", StringComparison.InvariantCulture) == 0 ||
string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 ||
string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0))
if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0)
file = _catalogBlocks;
else if(string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0)
file = _vtocBlocks;
else
file = _bootBlocks;
else
{
if(!_fileCache.TryGetValue(filename, out file))
{
ErrorNumber error = CacheFile(filename);
if(error != ErrorNumber.NoError)
return error;
if(!_fileCache.TryGetValue(filename, out file))
return ErrorNumber.InvalidArgument;
}
}
if(offset >= file.Length)
if(buffer is null ||
buffer.Length < length)
return ErrorNumber.InvalidArgument;
if(size + offset >= file.Length)
size = file.Length - offset;
if(node is not AppleDosFileNode mynode)
return ErrorNumber.InvalidArgument;
buf = new byte[size];
read = length;
Array.Copy(file, offset, buf, 0, size);
if(length + mynode.Offset >= mynode.Length)
read = mynode.Length - mynode.Offset;
Array.Copy(mynode._cache, mynode.Offset, buffer, 0, read);
mynode.Offset += read;
return ErrorNumber.NoError;
}