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

Refactor IMediaImage.ReadSector(s) to return error status instead of buffer.

Browse Source
This commit is contained in:
Natalia Portillo
2021-09-19 21:16:47 +01:00
parent fbccfb2ca9
commit f51d414abd
187 changed files with 4036 additions and 2081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Aaru.Filesystems/PFS.cs
View File

@@ -34,6 +34,7 @@ using System;
using System.Runtime.InteropServices;
using System.Text;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.Helpers;
using Schemas;
@@ -65,7 +66,7 @@ namespace Aaru.Filesystems
/// <inheritdoc />
public string Name => "Professional File System";
/// <inheritdoc />
public Guid Id => new Guid("68DE769E-D957-406A-8AE4-3781CA8CDA77");
public Guid Id => new("68DE769E-D957-406A-8AE4-3781CA8CDA77");
/// <inheritdoc />
public string Author => "Natalia Portillo";
@@ -75,7 +76,10 @@ namespace Aaru.Filesystems
if(partition.Length < 3)
return false;
byte[] sector = imagePlugin.ReadSector(2 + partition.Start);
ErrorNumber errno = imagePlugin.ReadSector(2 + partition.Start, out byte[] sector);
if(errno != ErrorNumber.NoError)
return false;
uint magic = BigEndianBitConverter.ToUInt32(sector, 0x00);
@@ -87,9 +91,14 @@ namespace Aaru.Filesystems
public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
Encoding encoding)
{
Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1");
byte[] rootBlockSector = imagePlugin.ReadSector(2 + partition.Start);
RootBlock rootBlock = Marshal.ByteArrayToStructureBigEndian<RootBlock>(rootBlockSector);
information = "";
Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1");
ErrorNumber errno = imagePlugin.ReadSector(2 + partition.Start, out byte[] rootBlockSector);
if(errno != ErrorNumber.NoError)
return;
RootBlock rootBlock = Marshal.ByteArrayToStructureBigEndian<RootBlock>(rootBlockSector);
var sbInformation = new StringBuilder();
XmlFsType = new FileSystemType();