General refactor and cleanup.

2025-12-16 19:24:25 +00:00 · 2024-05-01 04:05:22 +01:00
parent 185a8c3fd5
commit e46d21bde6
922 changed files with 36437 additions and 29485 deletions
--- a/Aaru.Filesystems/FFS/Info.cs
+++ b/Aaru.Filesystems/FFS/Info.cs
@@ -36,8 +36,6 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 using Partition = Aaru.CommonTypes.Partition;
-using time_t = int;
-using ufs_daddr_t = int;

 namespace Aaru.Filesystems;

@@ -52,8 +50,7 @@ public sealed partial class FFSPlugin
    /// <inheritdoc />
    public bool Identify(IMediaImage imagePlugin, Partition partition)
    {
-        if(2 + partition.Start >= partition.End)
-            return false;
+        if(2 + partition.Start >= partition.End) return false;

        uint sbSizeInSectors;

@@ -76,13 +73,18 @@ public sealed partial class FFSPlugin
                ErrorNumber errno =
                    imagePlugin.ReadSectors(partition.Start + loc, sbSizeInSectors, out byte[] ufsSbSectors);

-                if(errno != ErrorNumber.NoError)
-                    continue;
+                if(errno != ErrorNumber.NoError) continue;

                var magic = BitConverter.ToUInt32(ufsSbSectors, 0x055C);

-                if(magic is UFS_MAGIC or UFS_CIGAM or UFS_MAGIC_BW or UFS_CIGAM_BW or UFS2_MAGIC or UFS2_CIGAM
-                         or UFS_BAD_MAGIC or UFS_BAD_CIGAM)
+                if(magic is UFS_MAGIC
+                         or UFS_CIGAM
+                         or UFS_MAGIC_BW
+                         or UFS_CIGAM_BW
+                         or UFS2_MAGIC
+                         or UFS2_CIGAM
+                         or UFS_BAD_MAGIC
+                         or UFS_BAD_CIGAM)
                    return true;
            }

@@ -132,13 +134,18 @@ public sealed partial class FFSPlugin
        {
            errno = imagePlugin.ReadSectors(partition.Start + loc, sb_size_in_sectors, out ufs_sb_sectors);

-            if(errno != ErrorNumber.NoError)
-                continue;
+            if(errno != ErrorNumber.NoError) continue;

            magic = BitConverter.ToUInt32(ufs_sb_sectors, 0x055C);

-            if(magic is UFS_MAGIC or UFS_CIGAM or UFS_MAGIC_BW or UFS_CIGAM_BW or UFS2_MAGIC or UFS2_CIGAM
-                     or UFS_BAD_MAGIC or UFS_BAD_CIGAM)
+            if(magic is UFS_MAGIC
+                     or UFS_CIGAM
+                     or UFS_MAGIC_BW
+                     or UFS_CIGAM_BW
+                     or UFS2_MAGIC
+                     or UFS2_CIGAM
+                     or UFS_BAD_MAGIC
+                     or UFS_BAD_CIGAM)
            {
                sb_offset = partition.Start + loc;

@@ -206,8 +213,7 @@ public sealed partial class FFSPlugin
        // Fun with seeking follows on superblock reading!
        errno = imagePlugin.ReadSectors(sb_offset, sb_size_in_sectors, out ufs_sb_sectors);

-        if(errno != ErrorNumber.NoError)
-            return;
+        if(errno != ErrorNumber.NoError) return;

        SuperBlock sb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(ufs_sb_sectors);

@@ -323,30 +329,24 @@ public sealed partial class FFSPlugin

        if(!fs_type_ufs2)
        {
-            sbInformation.AppendLine(Localization.
-                                         There_are_a_lot_of_variants_of_UFS_using_overlapped_values_on_same_fields);
+            sbInformation.AppendLine(Localization
+                                        .There_are_a_lot_of_variants_of_UFS_using_overlapped_values_on_same_fields);

-            sbInformation.AppendLine(Localization.
-                                         I_will_try_to_guess_which_one_it_is_but_unless_its_UFS2_I_may_be_surely_wrong);
+            sbInformation.AppendLine(Localization
+                                        .I_will_try_to_guess_which_one_it_is_but_unless_its_UFS2_I_may_be_surely_wrong);
        }

-        if(fs_type_42bsd)
-            sbInformation.AppendLine(Localization.Guessed_as_42BSD_FFS);
+        if(fs_type_42bsd) sbInformation.AppendLine(Localization.Guessed_as_42BSD_FFS);

-        if(fs_type_43bsd)
-            sbInformation.AppendLine(Localization.Guessed_as_43BSD_FFS);
+        if(fs_type_43bsd) sbInformation.AppendLine(Localization.Guessed_as_43BSD_FFS);

-        if(fs_type_44bsd)
-            sbInformation.AppendLine(Localization.Guessed_as_44BSD_FFS);
+        if(fs_type_44bsd) sbInformation.AppendLine(Localization.Guessed_as_44BSD_FFS);

-        if(fs_type_sun)
-            sbInformation.AppendLine(Localization.Guessed_as_SunOS_FFS);
+        if(fs_type_sun) sbInformation.AppendLine(Localization.Guessed_as_SunOS_FFS);

-        if(fs_type_sun86)
-            sbInformation.AppendLine(Localization.Guessed_as_SunOS_x86_FFS);
+        if(fs_type_sun86) sbInformation.AppendLine(Localization.Guessed_as_SunOS_x86_FFS);

-        if(fs_type_ufs)
-            sbInformation.AppendLine(Localization.Guessed_as_UFS);
+        if(fs_type_ufs) sbInformation.AppendLine(Localization.Guessed_as_UFS);

        if(fs_type_42bsd)
            sbInformation.AppendFormat(Localization.Linked_list_of_filesystems_0, sb.fs_link).AppendLine();
@@ -357,21 +357,23 @@ public sealed partial class FFSPlugin
        sbInformation.AppendFormat(Localization.First_data_block_LBA_0,              sb.fs_dblkno).AppendLine();
        sbInformation.AppendFormat(Localization.Cylinder_group_offset_in_cylinder_0, sb.fs_old_cgoffset).AppendLine();

-        sbInformation.AppendFormat(Localization.Volume_last_written_on_0, DateHandlers.UnixToDateTime(sb.fs_old_time)).
-                      AppendLine();
+        sbInformation.AppendFormat(Localization.Volume_last_written_on_0, DateHandlers.UnixToDateTime(sb.fs_old_time))
+                     .AppendLine();

        metadata.ModificationDate = DateHandlers.UnixToDateTime(sb.fs_old_time);

-        sbInformation.AppendFormat(Localization._0_blocks_in_volume_1_bytes, sb.fs_old_size,
-                                   (long)sb.fs_old_size * sb.fs_fsize).
-                      AppendLine();
+        sbInformation.AppendFormat(Localization._0_blocks_in_volume_1_bytes,
+                                   sb.fs_old_size,
+                                   (long)sb.fs_old_size * sb.fs_fsize)
+                     .AppendLine();

        metadata.Clusters    = (ulong)sb.fs_old_size;
        metadata.ClusterSize = (uint)sb.fs_fsize;

-        sbInformation.AppendFormat(Localization._0_data_blocks_in_volume_1_bytes, sb.fs_old_dsize,
-                                   (long)sb.fs_old_dsize * sb.fs_fsize).
-                      AppendLine();
+        sbInformation.AppendFormat(Localization._0_data_blocks_in_volume_1_bytes,
+                                   sb.fs_old_dsize,
+                                   (long)sb.fs_old_dsize * sb.fs_fsize)
+                     .AppendLine();

        sbInformation.AppendFormat(Localization._0_cylinder_groups_in_volume, sb.fs_ncg).AppendLine();
        sbInformation.AppendFormat(Localization._0_bytes_in_a_basic_block,    sb.fs_bsize).AppendLine();
@@ -380,9 +382,9 @@ public sealed partial class FFSPlugin
        sbInformation.AppendFormat(Localization._0_of_blocks_must_be_free,    sb.fs_minfree).AppendLine();
        sbInformation.AppendFormat(Localization._0_ms_for_optimal_next_block, sb.fs_old_rotdelay).AppendLine();

-        sbInformation.
-            AppendFormat(Localization.Disk_rotates_0_times_per_second_1_rpm, sb.fs_old_rps, sb.fs_old_rps * 60).
-            AppendLine();
+        sbInformation
+           .AppendFormat(Localization.Disk_rotates_0_times_per_second_1_rpm, sb.fs_old_rps, sb.fs_old_rps * 60)
+           .AppendLine();

        /*          sbInformation.AppendFormat("fs_bmask: 0x{0:X8}", sb.fs_bmask).AppendLine();
                    sbInformation.AppendFormat("fs_fmask: 0x{0:X8}", sb.fs_fmask).AppendLine();
@@ -415,8 +417,8 @@ public sealed partial class FFSPlugin
            sbInformation.AppendFormat(Localization._0_sectors_track, sb.fs_old_npsect).AppendLine();
        else if(fs_type_sun86)
        {
-            sbInformation.AppendFormat(Localization.Volume_state_on_0, DateHandlers.UnixToDateTime(sb.fs_old_npsect)).
-                          AppendLine();
+            sbInformation.AppendFormat(Localization.Volume_state_on_0, DateHandlers.UnixToDateTime(sb.fs_old_npsect))
+                         .AppendLine();
        }

        sbInformation.AppendFormat(Localization.Hardware_sector_interleave_0, sb.fs_old_interleave).AppendLine();
@@ -447,9 +449,10 @@ public sealed partial class FFSPlugin
        sbInformation.AppendFormat(Localization._0_blocks_per_group, sb.fs_fpg / sb.fs_frag).AppendLine();
        sbInformation.AppendFormat(Localization._0_directories, sb.fs_old_cstotal.cs_ndir).AppendLine();

-        sbInformation.AppendFormat(Localization._0_free_blocks_1_bytes, sb.fs_old_cstotal.cs_nbfree,
-                                   (long)sb.fs_old_cstotal.cs_nbfree * sb.fs_fsize).
-                      AppendLine();
+        sbInformation.AppendFormat(Localization._0_free_blocks_1_bytes,
+                                   sb.fs_old_cstotal.cs_nbfree,
+                                   (long)sb.fs_old_cstotal.cs_nbfree * sb.fs_fsize)
+                     .AppendLine();

        metadata.FreeClusters = (ulong)sb.fs_old_cstotal.cs_nbfree;
        sbInformation.AppendFormat(Localization._0_free_inodes, sb.fs_old_cstotal.cs_nifree).AppendLine();
@@ -461,26 +464,24 @@ public sealed partial class FFSPlugin
            metadata.Dirty = true;
        }

-        if(sb.fs_clean == 1)
-            sbInformation.AppendLine(Localization.Volume_is_clean);
+        if(sb.fs_clean == 1) sbInformation.AppendLine(Localization.Volume_is_clean);

-        if(sb.fs_ronly == 1)
-            sbInformation.AppendLine(Localization.Volume_is_read_only);
+        if(sb.fs_ronly == 1) sbInformation.AppendLine(Localization.Volume_is_read_only);

        sbInformation.AppendFormat(Localization.Volume_flags_0_X2, sb.fs_flags).AppendLine();

        if(fs_type_ufs)
        {
-            sbInformation.AppendFormat(Localization.Volume_last_mounted_at_0, StringHandlers.CToString(sb.fs_fsmnt)).
-                          AppendLine();
+            sbInformation.AppendFormat(Localization.Volume_last_mounted_at_0, StringHandlers.CToString(sb.fs_fsmnt))
+                         .AppendLine();
        }
        else if(fs_type_ufs2)
        {
-            sbInformation.AppendFormat(Localization.Volume_last_mounted_at_0, StringHandlers.CToString(sb.fs_fsmnt)).
-                          AppendLine();
+            sbInformation.AppendFormat(Localization.Volume_last_mounted_at_0, StringHandlers.CToString(sb.fs_fsmnt))
+                         .AppendLine();

-            sbInformation.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(sb.fs_volname)).
-                          AppendLine();
+            sbInformation.AppendFormat(Localization.Volume_name_0, StringHandlers.CToString(sb.fs_volname))
+                         .AppendLine();

            metadata.VolumeName = StringHandlers.CToString(sb.fs_volname);
            sbInformation.AppendFormat(Localization.Volume_ID_0_X16, sb.fs_swuid).AppendLine();
@@ -488,33 +489,34 @@ public sealed partial class FFSPlugin
            //xmlFSType.VolumeSerial = string.Format("{0:X16}", sb.fs_swuid);
            sbInformation.AppendFormat(Localization.Last_searched_cylinder_group_0, sb.fs_cgrotor).AppendLine();

-            sbInformation.AppendFormat(Localization._0_contiguously_allocated_directories, sb.fs_contigdirs).
-                          AppendLine();
+            sbInformation.AppendFormat(Localization._0_contiguously_allocated_directories, sb.fs_contigdirs)
+                         .AppendLine();

            sbInformation.AppendFormat(Localization.Standard_superblock_LBA_0, sb.fs_sblkno).AppendLine();
            sbInformation.AppendFormat(Localization._0_directories,            sb.fs_cstotal.cs_ndir).AppendLine();

-            sbInformation.AppendFormat(Localization._0_free_blocks_1_bytes, sb.fs_cstotal.cs_nbfree,
-                                       sb.fs_cstotal.cs_nbfree * sb.fs_fsize).
-                          AppendLine();
+            sbInformation.AppendFormat(Localization._0_free_blocks_1_bytes,
+                                       sb.fs_cstotal.cs_nbfree,
+                                       sb.fs_cstotal.cs_nbfree * sb.fs_fsize)
+                         .AppendLine();

            metadata.FreeClusters = (ulong)sb.fs_cstotal.cs_nbfree;
            sbInformation.AppendFormat(Localization._0_free_inodes,   sb.fs_cstotal.cs_nifree).AppendLine();
            sbInformation.AppendFormat(Localization._0_free_frags,    sb.fs_cstotal.cs_nffree).AppendLine();
            sbInformation.AppendFormat(Localization._0_free_clusters, sb.fs_cstotal.cs_numclusters).AppendLine();

-            sbInformation.AppendFormat(Localization.Volume_last_written_on_0, DateHandlers.UnixToDateTime(sb.fs_time)).
-                          AppendLine();
+            sbInformation.AppendFormat(Localization.Volume_last_written_on_0, DateHandlers.UnixToDateTime(sb.fs_time))
+                         .AppendLine();

            metadata.ModificationDate = DateHandlers.UnixToDateTime(sb.fs_time);

-            sbInformation.AppendFormat(Localization._0_blocks_1_bytes, sb.fs_size, sb.fs_size * sb.fs_fsize).
-                          AppendLine();
+            sbInformation.AppendFormat(Localization._0_blocks_1_bytes, sb.fs_size, sb.fs_size * sb.fs_fsize)
+                         .AppendLine();

            metadata.Clusters = (ulong)sb.fs_size;

-            sbInformation.AppendFormat(Localization._0_data_blocks_1_bytes, sb.fs_dsize, sb.fs_dsize * sb.fs_fsize).
-                          AppendLine();
+            sbInformation.AppendFormat(Localization._0_data_blocks_1_bytes, sb.fs_dsize, sb.fs_dsize * sb.fs_fsize)
+                         .AppendLine();

            sbInformation.AppendFormat(Localization.Cylinder_group_summary_area_LBA_0, sb.fs_csaddr).AppendLine();
            sbInformation.AppendFormat(Localization._0_blocks_pending_of_being_freed, sb.fs_pendingblocks).AppendLine();
@@ -523,23 +525,23 @@ public sealed partial class FFSPlugin

        if(fs_type_sun)
        {
-            sbInformation.AppendFormat(Localization.Volume_state_on_0, DateHandlers.UnixToDateTime(sb.fs_old_npsect)).
-                          AppendLine();
+            sbInformation.AppendFormat(Localization.Volume_state_on_0, DateHandlers.UnixToDateTime(sb.fs_old_npsect))
+                         .AppendLine();
        }
        else if(fs_type_sun86)
            sbInformation.AppendFormat(Localization._0_sectors_track, sb.fs_state).AppendLine();
        else if(fs_type_44bsd)
        {
-            sbInformation.AppendFormat(Localization._0_blocks_on_cluster_summary_array, sb.fs_contigsumsize).
-                          AppendLine();
+            sbInformation.AppendFormat(Localization._0_blocks_on_cluster_summary_array, sb.fs_contigsumsize)
+                         .AppendLine();

-            sbInformation.AppendFormat(Localization.Maximum_length_of_a_symbolic_link_0, sb.fs_maxsymlinklen).
-                          AppendLine();
+            sbInformation.AppendFormat(Localization.Maximum_length_of_a_symbolic_link_0, sb.fs_maxsymlinklen)
+                         .AppendLine();

            sbInformation.AppendFormat(Localization.A_file_can_be_0_bytes_at_max, sb.fs_maxfilesize).AppendLine();

-            sbInformation.AppendFormat(Localization.Volume_state_on_0, DateHandlers.UnixToDateTime(sb.fs_state)).
-                          AppendLine();
+            sbInformation.AppendFormat(Localization.Volume_state_on_0, DateHandlers.UnixToDateTime(sb.fs_state))
+                         .AppendLine();
        }

        if(sb.fs_old_nrpos > 0)