From e28d04a29b84567e1547c73e3edbc91304751d73 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 17 Sep 2017 06:04:59 +0100 Subject: [PATCH] Corrected System V clusters calculation. --- DiscImageChef.Filesystems/SysV.cs | 3 +++ DiscImageChef.Tests/Filesystems/SysV.cs | 2 +- DiscImageChef.Tests/Filesystems/SysV_RDB.cs | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/DiscImageChef.Filesystems/SysV.cs b/DiscImageChef.Filesystems/SysV.cs index 4d1a1d69..beb4090a 100644 --- a/DiscImageChef.Filesystems/SysV.cs +++ b/DiscImageChef.Filesystems/SysV.cs @@ -498,6 +498,7 @@ namespace DiscImageChef.Filesystems if(bs != imagePlugin.GetSectorSize()) sb.AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/sector", bs, imagePlugin.GetSectorSize()).AppendLine(); } + xmlFSType.Clusters = sysv_sb.s_fsize; sb.AppendFormat("{0} zones on volume ({1} bytes)", sysv_sb.s_fsize, sysv_sb.s_fsize * bs).AppendLine(); sb.AppendFormat("{0} free zones on volume ({1} bytes)", sysv_sb.s_tfree, sysv_sb.s_tfree * bs).AppendLine(); sb.AppendFormat("{0} free blocks on list ({1} bytes)", sysv_sb.s_nfree, sysv_sb.s_nfree * bs).AppendLine(); @@ -558,6 +559,7 @@ namespace DiscImageChef.Filesystems xmlFSType.Type = "Coherent fs"; xmlFSType.ClusterSize = 512; + xmlFSType.Clusters = coh_sb.s_fsize; sb.AppendLine("Coherent UNIX filesystem"); if(imagePlugin.GetSectorSize() != 512) @@ -613,6 +615,7 @@ namespace DiscImageChef.Filesystems xmlFSType.Type = "UNIX 7th Edition fs"; xmlFSType.ClusterSize = 512; + xmlFSType.Clusters = v7_sb.s_fsize; sb.AppendLine("UNIX 7th Edition filesystem"); if(imagePlugin.GetSectorSize() != 512) sb.AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/sector", 512, 2048).AppendLine(); diff --git a/DiscImageChef.Tests/Filesystems/SysV.cs b/DiscImageChef.Tests/Filesystems/SysV.cs index 1a0f502e..ca40b8c4 100644 --- a/DiscImageChef.Tests/Filesystems/SysV.cs +++ b/DiscImageChef.Tests/Filesystems/SysV.cs @@ -80,7 +80,7 @@ namespace DiscImageChef.Tests.Filesystems }; readonly string[] type = { - "SVR4 fs", + "SVR2 fs", }; [Test] diff --git a/DiscImageChef.Tests/Filesystems/SysV_RDB.cs b/DiscImageChef.Tests/Filesystems/SysV_RDB.cs index 72f17da6..12fd3a81 100644 --- a/DiscImageChef.Tests/Filesystems/SysV_RDB.cs +++ b/DiscImageChef.Tests/Filesystems/SysV_RDB.cs @@ -63,7 +63,7 @@ namespace DiscImageChef.Tests.Filesystems }; readonly long[] clusters = { - 511488, + 511424, }; readonly int[] clustersize = {