feat(kernel/hefs): Fixed the shortcomings and issues of HeFS.

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>

34 files changed, 259 insertions, 207 deletions

diff --git a/dev/boot/BootKit/BootKit.h b/dev/boot/BootKit/BootKit.h
index cc80e359..85de8d86 100644
--- a/dev/boot/BootKit/BootKit.h
+++ b/dev/boot/BootKit/BootKit.h
@@ -293,16 +293,16 @@ inline Boolean BDiskFormatFactory<BootDev>::Format(const Char* part_name) {
   CopyMem(gpt_part->Signature, reinterpret_cast<VoidPtr>(const_cast<Char*>(kMagicGPT)),
           StrLen(kMagicGPT));
 
-  gpt_part->Revision   = 0x00010000;
+  gpt_part->Revision = 0x00010000;
   gpt_part->HeaderSize = sizeof(GPT_PARTITION_TABLE);
 
   gpt_part->CRC32 = 0x00000000;
 
-  gpt_part->Reserved1     = 0x00000000;
-  gpt_part->LBAHeader     = 0x00000000;
-  gpt_part->LBAAltHeader  = 0x00000000;
+  gpt_part->Reserved1 = 0x00000000;
+  gpt_part->LBAHeader = 0x00000000;
+  gpt_part->LBAAltHeader = 0x00000000;
   gpt_part->FirstGPTEntry = 0x00000000;
-  gpt_part->LastGPTEntry  = 0x00000000;
+  gpt_part->LastGPTEntry = 0x00000000;
 
   gpt_part->Guid.Data1 = 0x00000000;
   gpt_part->Guid.Data2 = 0x0000;
@@ -312,10 +312,10 @@ inline Boolean BDiskFormatFactory<BootDev>::Format(const Char* part_name) {
 
   gpt_part->Revision = 0x00010000;
 
-  gpt_part->StartingLBA         = 0x00000000;
+  gpt_part->StartingLBA = 0x00000000;
   gpt_part->NumPartitionEntries = 0x00000000;
-  gpt_part->SizeOfEntries       = 0x00000000;
-  gpt_part->CRC32PartEntry      = 0x00000000;
+  gpt_part->SizeOfEntries = 0x00000000;
+  gpt_part->CRC32PartEntry = 0x00000000;
 
   SetMem(gpt_part->Reserved2, 0, kSectorAlignGPT_PartTbl);
 
diff --git a/dev/boot/modules/BootNet/BootNet.cc b/dev/boot/modules/BootNet/BootNet.cc
index 840aabd5..3ea7350e 100644
--- a/dev/boot/modules/BootNet/BootNet.cc
+++ b/dev/boot/modules/BootNet/BootNet.cc
@@ -12,8 +12,8 @@
 #include <FirmwareKit/EFI/API.h>
 #include <modules/BootNet/BootNet.h>
 
-STATIC EfiGUID                      kEfiSimpleProtoGUID = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
-STATIC EFI_SIMPLE_NETWORK_PROTOCOL* kEfiProtocol        = nullptr;
+STATIC EfiGUID kEfiSimpleProtoGUID               = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
+STATIC EFI_SIMPLE_NETWORK_PROTOCOL* kEfiProtocol = nullptr;
 
 STATIC Void bootnet_read_ip_packet(BOOTNET_INTERNET_HEADER   inet,
                                    BOOTNET_INTERNET_HEADER** inet_out);
diff --git a/dev/boot/src/HEL/AMD64/BootATA.cc b/dev/boot/src/HEL/AMD64/BootATA.cc
index e1ccbfc3..903a650d 100644
--- a/dev/boot/src/HEL/AMD64/BootATA.cc
+++ b/dev/boot/src/HEL/AMD64/BootATA.cc
@@ -114,7 +114,7 @@ Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeASCII* Buf,
 
   rt_out8(IO + ATA_REG_SEC_COUNT0, ((Size + SectorSz) / SectorSz));
 
-  rt_out8(IO + ATA_REG_LBA0, (Lba) & 0xFF);
+  rt_out8(IO + ATA_REG_LBA0, (Lba) &0xFF);
   rt_out8(IO + ATA_REG_LBA1, (Lba) >> 8);
   rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16);
   rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24);
@@ -143,7 +143,7 @@ Void boot_ata_write(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeASCII* Buf
 
   rt_out8(IO + ATA_REG_SEC_COUNT0, ((Size + (SectorSz)) / SectorSz));
 
-  rt_out8(IO + ATA_REG_LBA0, (Lba) & 0xFF);
+  rt_out8(IO + ATA_REG_LBA0, (Lba) &0xFF);
   rt_out8(IO + ATA_REG_LBA1, (Lba) >> 8);
   rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16);
   rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24);
diff --git a/dev/boot/src/HEL/ARM64/BootPlatform.cc b/dev/boot/src/HEL/ARM64/BootPlatform.cc
index 683245fb..9dd03afe 100644
--- a/dev/boot/src/HEL/ARM64/BootPlatform.cc
+++ b/dev/boot/src/HEL/ARM64/BootPlatform.cc
@@ -13,7 +13,8 @@
 using namespace Boot;
 
 EXTERN_C void rt_halt() {
-  while (Yes);
+  while (Yes)
+    ;
 }
 
 EXTERN_C void rt_cli() {}
diff --git a/dev/boot/src/New+Delete.cc b/dev/boot/src/New+Delete.cc
index f7ad2898..d4d5dfed 100644
--- a/dev/boot/src/New+Delete.cc
+++ b/dev/boot/src/New+Delete.cc
@@ -17,7 +17,8 @@
 void* operator new(size_t sz) {
   void* buf = nullptr;
 
-  while (BS->AllocatePool(EfiMemoryType::EfiLoaderData, sz, &buf) != kEfiOk);
+  while (BS->AllocatePool(EfiMemoryType::EfiLoaderData, sz, &buf) != kEfiOk)
+    ;
 
   return buf;
 }
diff --git a/dev/kernel/FSKit/HeFS.h b/dev/kernel/FSKit/HeFS.h
index bf1bf867..d2fa6a1a 100644
--- a/dev/kernel/FSKit/HeFS.h
+++ b/dev/kernel/FSKit/HeFS.h
@@ -147,6 +147,17 @@ struct PACKED HEFS_JOURNAL_NODE {
   UInt8  fPad[487];

 };

 

+/// @brief This enum defines the opcode of the journal, here mentioned as 'kinds'

+enum HeFSJournalKind : UInt8 {

+  kJournalKindInvalid  = 0x00,

+  kJournalKindWrite    = 0x01,

+  kJournalKindRename   = 0x02,

+  kJournalKindDelete   = 0x03,

+  kJournalKindFlagEdit = 0x04,

+  kJournalKindCreate   = 0x05,

+  kJournalKindCount,

+};

+

 /// @brief HeFS index node.

 /// @details This structure is used to store the file information of a file.

 /// @note The index node is a special type of INode that contains the file information.

@@ -248,7 +259,7 @@ inline UInt32 hefs_hour_get(ATime raw_atime) noexcept {
 /// @return the minute value.

 /// @note The minute is stored in the lower 8 bits of the ATime value.

 inline UInt32 hefs_minute_get(ATime raw_atime) noexcept {

-  return (raw_atime) & 0xFF;

+  return (raw_atime) &0xFF;

 }

 

 inline constexpr UInt32 kHeFSBaseYear   = 1970;

@@ -368,10 +379,10 @@ class HeFileSystemParser final {
   ~HeFileSystemParser() = default;

 

  public:

-  HeFileSystemParser(const HeFileSystemParser&)            = delete;

+  HeFileSystemParser(const HeFileSystemParser&) = delete;

   HeFileSystemParser& operator=(const HeFileSystemParser&) = delete;

 

-  HeFileSystemParser(HeFileSystemParser&&)            = delete;

+  HeFileSystemParser(HeFileSystemParser&&) = delete;

   HeFileSystemParser& operator=(HeFileSystemParser&&) = delete;

 

  public:

diff --git a/dev/kernel/FirmwareKit/EFI/EFI.h b/dev/kernel/FirmwareKit/EFI/EFI.h
index 196deb29..e2fa3843 100644
--- a/dev/kernel/FirmwareKit/EFI/EFI.h
+++ b/dev/kernel/FirmwareKit/EFI/EFI.h
@@ -57,7 +57,7 @@ typedef Char16 EfiChar16Type;
 /// @brief Core Handle Kind
 /// Self is like NT's Win32 HANDLE type.
 typedef struct EfiHandle {
-}* EfiHandlePtr;
+} * EfiHandlePtr;
 
 /* UEFI uses wide characters by default. */
 typedef WideChar EfiCharType;
@@ -239,85 +239,63 @@ typedef struct EfiTableHeader {
   UInt32 Reserved;
 } EfiTableHeader;
 
-#define EFI_ACPI_TABLE_PROTOCOL_GUID                 \
-  {                                                  \
-    0xffe06bdd, 0x6107, 0x46a6, {                    \
-      0x7b, 0xb2, 0x5a, 0x9c, 0x7e, 0xc5, 0x27, 0x5c \
-    }                                                \
+#define EFI_ACPI_TABLE_PROTOCOL_GUID                                               \
+  {                                                                                \
+    0xffe06bdd, 0x6107, 0x46a6, { 0x7b, 0xb2, 0x5a, 0x9c, 0x7e, 0xc5, 0x27, 0x5c } \
   }
 
-#define EFI_LOAD_FILE_PROTOCOL_GUID                  \
-  {                                                  \
-    0x56EC3091, 0x954C, 0x11d2, {                    \
-      0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
-    }                                                \
+#define EFI_LOAD_FILE_PROTOCOL_GUID                                                \
+  {                                                                                \
+    0x56EC3091, 0x954C, 0x11d2, { 0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
   }
 
-#define EFI_LOAD_FILE2_PROTOCOL_GUID                 \
-  {                                                  \
-    0x4006c0c1, 0xfcb3, 0x403e, {                    \
-      0x99, 0x6d, 0x4a, 0x6c, 0x87, 0x24, 0xe0, 0x6d \
-    }                                                \
+#define EFI_LOAD_FILE2_PROTOCOL_GUID                                               \
+  {                                                                                \
+    0x4006c0c1, 0xfcb3, 0x403e, { 0x99, 0x6d, 0x4a, 0x6c, 0x87, 0x24, 0xe0, 0x6d } \
   }
 
-#define EFI_LOADED_IMAGE_PROTOCOL_GUID               \
-  {                                                  \
-    0x5B1B31A1, 0x9562, 0x11d2, {                    \
-      0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B \
-    }                                                \
+#define EFI_LOADED_IMAGE_PROTOCOL_GUID                                             \
+  {                                                                                \
+    0x5B1B31A1, 0x9562, 0x11d2, { 0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B } \
   }
 
-#define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID            \
-  {                                                  \
-    0x9042a9de, 0x23dc, 0x4a38, {                    \
-      0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a \
-    }                                                \
+#define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID                                          \
+  {                                                                                \
+    0x9042a9de, 0x23dc, 0x4a38, { 0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a } \
   }
 
-#define EFI_SIMPLE_NETWORK_PROTOCOL_GUID             \
-  {                                                  \
-    0xA19832B9, 0xAC25, 0x11D3, {                    \
-      0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d \
-    }                                                \
+#define EFI_SIMPLE_NETWORK_PROTOCOL_GUID                                           \
+  {                                                                                \
+    0xA19832B9, 0xAC25, 0x11D3, { 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
   }
 
 #define EFI_SIMPLE_NETWORK_PROTOCOL_REVISION 0x00010000
 
-#define EFI_IP4_PROTOCOL_GUID                        \
-  {                                                  \
-    0x41d94cd2, 0x35b6, 0x455a, {                    \
-      0x82, 0x58, 0xd4, 0xe5, 0x13, 0x34, 0xaa, 0xdd \
-    }                                                \
+#define EFI_IP4_PROTOCOL_GUID                                                      \
+  {                                                                                \
+    0x41d94cd2, 0x35b6, 0x455a, { 0x82, 0x58, 0xd4, 0xe5, 0x13, 0x34, 0xaa, 0xdd } \
   }
 
 #define EFI_LOADED_IMAGE_PROTOCOL_REVISION 0x1000
 
-#define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID         \
-  {                                                  \
-    0x0964e5b22, 0x6459, 0x11d2, {                   \
-      0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
-    }                                                \
+#define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID                                        \
+  {                                                                                 \
+    0x0964e5b22, 0x6459, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
   }
 
-#define EFI_LOADED_IMAGE_DEVICE_PATH_PROTOCOL_GUID   \
-  {                                                  \
-    0xbc62157e, 0x3e33, 0x4fec, {                    \
-      0x99, 0x20, 0x2d, 0x3b, 0x36, 0xd7, 0x50, 0xdf \
-    }                                                \
+#define EFI_LOADED_IMAGE_DEVICE_PATH_PROTOCOL_GUID                                 \
+  {                                                                                \
+    0xbc62157e, 0x3e33, 0x4fec, { 0x99, 0x20, 0x2d, 0x3b, 0x36, 0xd7, 0x50, 0xdf } \
   }
 
-#define EFI_DEVICE_PATH_PROTOCOL_GUID               \
-  {                                                 \
-    0x9576e91, 0x6d3f, 0x11d2, {                    \
-      0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
-    }                                               \
+#define EFI_DEVICE_PATH_PROTOCOL_GUID                                            \
+  {                                                                              \
+    0x9576e91, 0x6d3f, 0x11d2, { 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
   }
 
-#define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID         \
-  {                                                  \
-    0x0964e5b22, 0x6459, 0x11d2, {                   \
-      0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
-    }                                                \
+#define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID                                        \
+  {                                                                                 \
+    0x0964e5b22, 0x6459, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
   }
 
 typedef UInt64(EfiImageUnload)(EfiHandlePtr ImageHandle);
@@ -373,17 +351,17 @@ typedef struct {
 
 typedef EFI_STATUS(EFIAPI* EFI_SIMPLE_NETWORK_TRANSMIT)(IN EFI_SIMPLE_NETWORK_PROTOCOL* This,
                                                         IN UInt32 HeaderSize, IN UInt32 BufferSize,
-                                                        IN Void*                   Buffer,
-                                                        IN EfiMacAddress* SrcAddr  OPTIONAL,
+                                                        IN Void* Buffer,
+                                                        IN EfiMacAddress* SrcAddr OPTIONAL,
                                                         IN EfiMacAddress* DestAddr OPTIONAL,
-                                                        IN UInt16* Protocol        OPTIONAL);
+                                                        IN UInt16* Protocol OPTIONAL);
 
 typedef EFI_STATUS(EFIAPI* EFI_SIMPLE_NETWORK_RECEIVE)(IN EFI_SIMPLE_NETWORK_PROTOCOL* This,
-                                                       OUT UInt32* HeaderSize          OPTIONAL,
+                                                       OUT UInt32* HeaderSize OPTIONAL,
                                                        IN OUT UInt32* BufferSize, OUT Void* Buffer,
-                                                       OUT EfiMacAddress* SrcAddr  OPTIONAL,
+                                                       OUT EfiMacAddress* SrcAddr OPTIONAL,
                                                        OUT EfiMacAddress* DestAddr OPTIONAL,
-                                                       OUT UInt16* Protocol        OPTIONAL);
+                                                       OUT UInt16* Protocol OPTIONAL);
 
 typedef struct EFI_SIMPLE_NETWORK_PROTOCOL {
   UInt64                        Revision;
@@ -528,11 +506,9 @@ typedef struct EfiGUID EFI_FINAL {
  * Protocol stuff...
  */
 
-#define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID          \
-  {                                                  \
-    0x387477c1, 0x69c7, 0x11d2, {                    \
-      0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
-    }                                                \
+#define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID                                        \
+  {                                                                                \
+    0x387477c1, 0x69c7, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
   }
 
 /** some helpers */
@@ -631,7 +607,7 @@ typedef struct {
 } EfiInputKey;
 
 typedef EfiStatusType(EFI_API* EfiInputReadKey)(IN EfiSimpleTextInputProtocol* This,
-                                                OUT EfiInputKey*               Key);
+                                                OUT EfiInputKey* Key);
 
 typedef EfiStatusType(EFI_API* EfiInputReset)(IN EfiSimpleTextInputProtocol* This,
                                               IN Boolean                     ExtendedChk);
@@ -689,7 +665,7 @@ typedef struct EfiSystemTable {
   struct {
     EfiGUID VendorGUID;
     VoidPtr VendorTable;
-  }* ConfigurationTable;
+  } * ConfigurationTable;
 } EfiSystemTable;
 
 #define kEfiOk 0
@@ -750,11 +726,9 @@ enum {
 
 #define EFI_EXTRA_DESCRIPTOR_SIZE 8
 
-#define EFI_MP_SERVICES_PROTOCOL_GUID                \
-  {                                                  \
-    0x3fdda605, 0xa76e, 0x4f46, {                    \
-      0xad, 0x29, 0x12, 0xf4, 0x53, 0x1b, 0x3d, 0x08 \
-    }                                                \
+#define EFI_MP_SERVICES_PROTOCOL_GUID                                              \
+  {                                                                                \
+    0x3fdda605, 0xa76e, 0x4f46, { 0xad, 0x29, 0x12, 0xf4, 0x53, 0x1b, 0x3d, 0x08 } \
   }
 
 #define PROCESSOR_AS_BSP_BIT 0x00000001
@@ -851,11 +825,9 @@ typedef struct EfiTime {
   UInt8  Pad2;
 } EfiTime;
 
-#define EFI_FILE_INFO_GUID                           \
-  {                                                  \
-    0x09576e92, 0x6d3f, 0x11d2, {                    \
-      0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b \
-    }                                                \
+#define EFI_FILE_INFO_GUID                                                         \
+  {                                                                                \
+    0x09576e92, 0x6d3f, 0x11d2, { 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b } \
   }
 
 struct EfiFileInfo EFI_FINAL {
@@ -924,8 +896,8 @@ typedef EfiStatusType EFI_API (*EfiMpServicesStartupThisAP)(
     IN Void* ProcedureArgument OPTIONAL, OUT Boolean* Finished OPTIONAL);
 
 typedef EfiStatusType EFI_API (*EfiMpServicesDisableThisAP)(IN struct _EfiMpServicesProtocol* Self,
-                                                            IN UInt32             ProcessorNumber,
-                                                            IN Boolean            EnableAP,
+                                                            IN UInt32  ProcessorNumber,
+                                                            IN Boolean EnableAP,
                                                             IN UInt32* HealthFlag OPTIONAL);
 
 typedef EfiStatusType EFI_API (*EfiMpServicesWhoAmI)(IN struct _EfiMpServicesProtocol* Self,
diff --git a/dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc b/dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
index 641fb8e4..84c35615 100644
--- a/dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
+++ b/dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
@@ -128,7 +128,8 @@ EXTERN_C Kernel::Void idt_handle_breakpoint(Kernel::UIntPtr rip) {
   if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) {
     Kernel::kout << "Kernel: SIGTRAP\r";
 
-    while (YES);
+    while (YES)
+      ;
   }
 
   kIsScheduling = NO;
diff --git a/dev/kernel/HALKit/AMD64/HalDebugOutput.cc b/dev/kernel/HALKit/AMD64/HalDebugOutput.cc
index bd8fe734..5d14f214 100644
--- a/dev/kernel/HALKit/AMD64/HalDebugOutput.cc
+++ b/dev/kernel/HALKit/AMD64/HalDebugOutput.cc
@@ -57,6 +57,8 @@ namespace Detail {
 
 TerminalDevice::~TerminalDevice() = default;
 
+STATIC SizeT kX = kFontSizeX, kY = kFontSizeY;
+
 EXTERN_C void ke_utf_io_write(IDeviceObject<const Utf8Char*>* obj, const Utf8Char* bytes) {
   NE_UNUSED(bytes);
   NE_UNUSED(obj);
@@ -76,11 +78,36 @@ EXTERN_C void ke_utf_io_write(IDeviceObject<const Utf8Char*>* obj, const Utf8Cha
   index = 0;
   len   = urt_string_len(bytes);
 
+  Char tmp_str[2];
+
   while (index < len) {
     if (bytes[index] == '\r') HAL::rt_out8(Detail::kPort, '\r');
 
     HAL::rt_out8(Detail::kPort, bytes[index] == '\r' ? '\n' : bytes[index]);
 
+    tmp_str[0] = (bytes[index] > 127) ? '?' : bytes[index];
+    tmp_str[1] = 0;
+
+    fb_render_string(tmp_str, kY, kX, RGB(0xff, 0xff, 0xff));
+
+    if (bytes[index] == '\r') {
+      kY += kFontSizeY;
+      kX = kFontSizeX;
+    }
+
+    kX += kFontSizeX;
+
+    if (kX > kHandoverHeader->f_GOP.f_Width) {
+      kX = kFontSizeX;
+    }
+
+    if (kY > kHandoverHeader->f_GOP.f_Height) {
+      kY = kFontSizeY;
+
+      FBDrawInRegion(fb_get_clear_clr(), FB::FBAccessibilty::Height(), FB::FBAccessibilty::Width(),
+                     0, 0);
+    }
+
     ++index;
   }
 
@@ -107,32 +134,31 @@ EXTERN_C void ke_io_write(IDeviceObject<const Char*>* obj, const Char* bytes) {
   index = 0;
   len   = rt_string_len(bytes);
 
-  STATIC SizeT x = kFontSizeX, y = kFontSizeY;
+  Char tmp_str[2];
 
   while (index < len) {
     if (bytes[index] == '\r') HAL::rt_out8(Detail::kPort, '\r');
 
     HAL::rt_out8(Detail::kPort, bytes[index] == '\r' ? '\n' : bytes[index]);
 
-    char tmp_str[2];
     tmp_str[0] = bytes[index];
     tmp_str[1] = 0;
 
-    fb_render_string(tmp_str, y, x, RGB(0xff, 0xff, 0xff));
+    fb_render_string(tmp_str, kY, kX, RGB(0xff, 0xff, 0xff));
 
     if (bytes[index] == '\r') {
-      y += kFontSizeY;
-      x = kFontSizeX;
+      kY += kFontSizeY;
+      kX = kFontSizeX;
     }
 
-    x += kFontSizeX;
+    kX += kFontSizeX;
 
-    if (x > kHandoverHeader->f_GOP.f_Width) {
-      x = kFontSizeX;
+    if (kX > kHandoverHeader->f_GOP.f_Width) {
+      kX = kFontSizeX;
     }
 
-    if (y > kHandoverHeader->f_GOP.f_Height) {
-      y = kFontSizeY;
+    if (kY > kHandoverHeader->f_GOP.f_Height) {
+      kY = kFontSizeY;
 
       FBDrawInRegion(fb_get_clear_clr(), FB::FBAccessibilty::Height(), FB::FBAccessibilty::Width(),
                      0, 0);
diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc
index f41979bb..2747439a 100644
--- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc
+++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc
@@ -146,7 +146,8 @@ EXTERN_C Kernel::Void hal_real_init(Kernel::Void) noexcept {
 
     kTeams[team_index].Id() = team_index;
 
-    while (!UserProcessScheduler::The().SwitchTeam(kTeams[team_index]));
+    while (!UserProcessScheduler::The().SwitchTeam(kTeams[team_index]))
+      ;
 
     timer.Wait();
 
diff --git a/dev/kernel/HALKit/AMD64/Paging.h b/dev/kernel/HALKit/AMD64/Paging.h
index 3c7107bc..cfba232c 100644
--- a/dev/kernel/HALKit/AMD64/Paging.h
+++ b/dev/kernel/HALKit/AMD64/Paging.h
@@ -55,9 +55,7 @@ namespace Detail {
     PageEnable          = 31,
   };
 
-  inline UInt8 control_register_cast(ControlRegisterBits reg) {
-    return static_cast<UInt8>(reg);
-  }
+  inline UInt8 control_register_cast(ControlRegisterBits reg) { return static_cast<UInt8>(reg); }
 }  // namespace Detail
 
 auto mm_alloc_bitmap(Boolean wr, Boolean user, SizeT size, Bool is_page, SizeT pad = 0) -> VoidPtr;
diff --git a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc
index 42242dbe..a3079e0c 100644
--- a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc
+++ b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc
@@ -265,6 +265,9 @@ STATIC Void drv_std_input_output_ahci(UInt64 lba, UInt8* buffer, SizeT sector_sz
     if (timeout > kTimeout) {
       kout << "Disk hangup!\r";
       kSATAHba->Ports[kSATAIndex].Ci = 0;
+      err_global_get()               = kErrorDiskIsCorrupted;
+      rtl_dma_free(size_buffer);
+
       return;
     }
 
@@ -293,7 +296,8 @@ STATIC Void drv_std_input_output_ahci(UInt64 lba, UInt8* buffer, SizeT sector_sz
       goto ahci_io_end;
     } else {
       kout << "Warning: Disk still busy after command completion!\r";
-      while (kSATAHba->Ports[kSATAIndex].Tfd & (kSATASRBsy | kSATASRDrq));
+      while (kSATAHba->Ports[kSATAIndex].Tfd & (kSATASRBsy | kSATASRDrq))
+        ;
     }
 
   ahci_io_end:
diff --git a/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc
index 4688203f..39efb7d3 100644
--- a/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc
+++ b/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc
@@ -105,7 +105,7 @@ Void drv_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorSz
 
   rt_out8(IO + ATA_REG_SEC_COUNT0, ((Size + SectorSz - 1) / SectorSz));
 
-  rt_out8(IO + ATA_REG_LBA0, (Lba) & 0xFF);
+  rt_out8(IO + ATA_REG_LBA0, (Lba) &0xFF);
   rt_out8(IO + ATA_REG_LBA1, (Lba) >> 8);
   rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16);
   rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24);
@@ -123,7 +123,8 @@ Void drv_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorSz
 
   rt_out8(kATADevice.Bar(0x20) + 0x00, 0x09);  // Start DMA engine
 
-  while (rt_in8(kATADevice.Bar(0x20) + ATA_REG_STATUS) & 0x01);
+  while (rt_in8(kATADevice.Bar(0x20) + ATA_REG_STATUS) & 0x01)
+    ;
 
   rt_out8(kATADevice.Bar(0x20) + 0x00, 0x00);  // Stop DMA engine
 
@@ -146,7 +147,7 @@ Void drv_std_write(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorS
 
   rt_out8(IO + ATA_REG_SEC_COUNT0, ((Size + (SectorSz - 1)) / SectorSz));
 
-  rt_out8(IO + ATA_REG_LBA0, (Lba) & 0xFF);
+  rt_out8(IO + ATA_REG_LBA0, (Lba) &0xFF);
   rt_out8(IO + ATA_REG_LBA1, (Lba) >> 8);
   rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16);
   rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24);
@@ -162,7 +163,8 @@ Void drv_std_write(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorS
 
   rt_out8(IO + 0x00, 0x09);  // Start DMA engine
 
-  while (rt_in8(kATADevice.Bar(0x20) + ATA_REG_STATUS) & 0x01);
+  while (rt_in8(kATADevice.Bar(0x20) + ATA_REG_STATUS) & 0x01)
+    ;
 
   rt_out8(kATADevice.Bar(0x20) + 0x00, 0x00);  // Stop DMA engine
 
diff --git a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc
index b22330e4..aec21ee4 100644
--- a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc
+++ b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc
@@ -118,7 +118,7 @@ Void drv_pio_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT Sect
 
   rt_out8(IO + ATA_REG_SEC_COUNT0, ((Size + SectorSz) / SectorSz));
 
-  rt_out8(IO + ATA_REG_LBA0, (Lba) & 0xFF);
+  rt_out8(IO + ATA_REG_LBA0, (Lba) &0xFF);
   rt_out8(IO + ATA_REG_LBA1, (Lba) >> 8);
   rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16);
   rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24);
@@ -143,7 +143,7 @@ Void drv_pio_std_write(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT Sec
 
   rt_out8(IO + ATA_REG_SEC_COUNT0, ((Size + SectorSz) / SectorSz));
 
-  rt_out8(IO + ATA_REG_LBA0, (Lba) & 0xFF);
+  rt_out8(IO + ATA_REG_LBA0, (Lba) &0xFF);
   rt_out8(IO + ATA_REG_LBA1, (Lba) >> 8);
   rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16);
   rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24);
diff --git a/dev/kernel/HALKit/ARM64/HalApplicationProcessor.cc b/dev/kernel/HALKit/ARM64/HalApplicationProcessor.cc
index 14af1a16..7e55aa07 100644
--- a/dev/kernel/HALKit/ARM64/HalApplicationProcessor.cc
+++ b/dev/kernel/HALKit/ARM64/HalApplicationProcessor.cc
@@ -39,7 +39,8 @@ namespace Detail {
   STATIC BOOL kGICEnabled = NO;

 

   STATIC void mp_hang_fn(void) {

-    while (YES);

+    while (YES)

+      ;

 

     dbg_break_point();

   }

diff --git a/dev/kernel/HALKit/ARM64/HalKernelMain.cc b/dev/kernel/HALKit/ARM64/HalKernelMain.cc
index 3e6701ea..bf5849ef 100644
--- a/dev/kernel/HALKit/ARM64/HalKernelMain.cc
+++ b/dev/kernel/HALKit/ARM64/HalKernelMain.cc
@@ -62,7 +62,8 @@ EXTERN_C void hal_init_platform(Kernel::HEL::BootInfoHeader* handover_hdr) {
       team_index = 0U;
     }
 
-    while (!UserProcessScheduler::The().SwitchTeam(kTeams[team_index]));
+    while (!UserProcessScheduler::The().SwitchTeam(kTeams[team_index]))
+      ;
 
     timer.Wait();
 
diff --git a/dev/kernel/HALKit/ARM64/HalPagingMgrARM64.cc b/dev/kernel/HALKit/ARM64/HalPagingMgrARM64.cc
index 9fcee573..e0b67489 100644
--- a/dev/kernel/HALKit/ARM64/HalPagingMgrARM64.cc
+++ b/dev/kernel/HALKit/ARM64/HalPagingMgrARM64.cc
@@ -46,7 +46,8 @@ EXTERN_C Int32 mm_map_page(VoidPtr virtual_address, VoidPtr physical_address, UI
 
   NE_PAGE_STORE& page_store = NE_PAGE_STORE::The();
 
-  while (page_store.fStoreOp);
+  while (page_store.fStoreOp)
+    ;
 
   page_store.fStoreOp = Yes;
 
diff --git a/dev/kernel/HALKit/ARM64/Paging.h b/dev/kernel/HALKit/ARM64/Paging.h
index e23c0538..2eb02bc1 100644
--- a/dev/kernel/HALKit/ARM64/Paging.h
+++ b/dev/kernel/HALKit/ARM64/Paging.h
@@ -84,9 +84,7 @@ namespace Detail {
     PageEnable          = 31,
   };
 
-  inline UInt8 control_register_cast(ControlRegisterBits reg) {
-    return static_cast<UInt8>(reg);
-  }
+  inline UInt8 control_register_cast(ControlRegisterBits reg) { return static_cast<UInt8>(reg); }
 }  // namespace Detail
 
 struct PDE_4KB final {
diff --git a/dev/kernel/HALKit/POWER/HalApplicationProcessor.cc b/dev/kernel/HALKit/POWER/HalApplicationProcessor.cc
index eb44b72b..617b3dda 100644
--- a/dev/kernel/HALKit/POWER/HalApplicationProcessor.cc
+++ b/dev/kernel/HALKit/POWER/HalApplicationProcessor.cc
@@ -10,7 +10,8 @@
 
 namespace Kernel::Detail {
 STATIC void mp_hang_fn(void) {
-  while (YES);
+  while (YES)
+    ;
 }
 }  // namespace Kernel::Detail
 
diff --git a/dev/kernel/HALKit/RISCV/HalApplicationProcessor.cc b/dev/kernel/HALKit/RISCV/HalApplicationProcessor.cc
index 548167a4..80162b81 100644
--- a/dev/kernel/HALKit/RISCV/HalApplicationProcessor.cc
+++ b/dev/kernel/HALKit/RISCV/HalApplicationProcessor.cc
@@ -13,7 +13,8 @@ using namespace Kernel;
 namespace Kernel {

 namespace Detail {

   STATIC void mp_hang_fn(void) {

-    while (YES);

+    while (YES)

+      ;

   }

 

 }  // namespace Detail

diff --git a/dev/kernel/KernelKit/HardwareThreadScheduler.h b/dev/kernel/KernelKit/HardwareThreadScheduler.h
index 4f7746ef..d47b2994 100644
--- a/dev/kernel/KernelKit/HardwareThreadScheduler.h
+++ b/dev/kernel/KernelKit/HardwareThreadScheduler.h
@@ -101,7 +101,7 @@ class HardwareThreadScheduler final : public ISchedulable {
  public:
   Ref<HardwareThread*> operator[](SizeT idx);
   bool                 operator!() noexcept;
-  operator bool() noexcept;
+                       operator bool() noexcept;
 
   Bool IsUser() override { return Yes; }
 
diff --git a/dev/kernel/KernelKit/LoaderInterface.h b/dev/kernel/KernelKit/LoaderInterface.h
index f6a1b7e9..2b38ddbf 100644
--- a/dev/kernel/KernelKit/LoaderInterface.h
+++ b/dev/kernel/KernelKit/LoaderInterface.h
@@ -23,9 +23,9 @@ class LoaderInterface {
 
  public:
   virtual _Output ErrorOr<VoidPtr> GetBlob()                                              = 0;
-  virtual _Output const Char*      AsString()                                             = 0;
-  virtual _Output const Char*      MIME()                                                 = 0;
-  virtual _Output const Char*      Path()                                                 = 0;
+  virtual _Output const Char* AsString()                                                  = 0;
+  virtual _Output const Char* MIME()                                                      = 0;
+  virtual _Output const Char* Path()                                                      = 0;
   virtual _Output ErrorOr<VoidPtr> FindStart()                                            = 0;
   virtual _Output ErrorOr<VoidPtr> FindSymbol(_Input const Char* name, _Input Int32 kind) = 0;
 };
diff --git a/dev/kernel/KernelKit/PCI/DMA.h b/dev/kernel/KernelKit/PCI/DMA.h
index 28256389..66d64f61 100644
--- a/dev/kernel/KernelKit/PCI/DMA.h
+++ b/dev/kernel/KernelKit/PCI/DMA.h
@@ -46,7 +46,7 @@ class DMAWrapper final {
   T* Get(UIntPtr off = 0);
 
  public:
-  operator bool();
+       operator bool();
   bool operator!();
 
  public:
diff --git a/dev/kernel/KernelKit/UserProcessScheduler.h b/dev/kernel/KernelKit/UserProcessScheduler.h
index b64e5ce1..3ed3cbfe 100644
--- a/dev/kernel/KernelKit/UserProcessScheduler.h
+++ b/dev/kernel/KernelKit/UserProcessScheduler.h
@@ -215,7 +215,7 @@ class UserProcessScheduler final : public ISchedulable {
   NE_COPY_DELETE(UserProcessScheduler)
   NE_MOVE_DELETE(UserProcessScheduler)
 
-  operator bool();
+       operator bool();
   bool operator!();
 
  public:
diff --git a/dev/kernel/NewKit/Macros.h b/dev/kernel/NewKit/Macros.h
index e8f18c24..ef4742d3 100644
--- a/dev/kernel/NewKit/Macros.h
+++ b/dev/kernel/NewKit/Macros.h
@@ -16,7 +16,7 @@
 #endif
 
 #ifndef kib_cast
-#define kib_cast(X) (Kernel::UInt64)((X) * 1024)
+#define kib_cast(X) (Kernel::UInt64)((X) *1024)
 #endif
 
 #ifndef MIB
diff --git a/dev/kernel/NewKit/OwnPtr.h b/dev/kernel/NewKit/OwnPtr.h
index f00f51c4..14b2fe39 100644
--- a/dev/kernel/NewKit/OwnPtr.h
+++ b/dev/kernel/NewKit/OwnPtr.h
@@ -50,7 +50,7 @@ class OwnPtr final {
 
   Ref<T> AsRef() { return Ref<T>(fCls); }
 
-  operator bool() { return fCls; }
+       operator bool() { return fCls; }
   bool operator!() { return !fCls; }
 
  private:
diff --git a/dev/kernel/src/FS/HeFS+FileSystemParser.cc b/dev/kernel/src/FS/HeFS+FileSystemParser.cc
index e91040b2..f8208048 100644
--- a/dev/kernel/src/FS/HeFS+FileSystemParser.cc
+++ b/dev/kernel/src/FS/HeFS+FileSystemParser.cc
@@ -470,6 +470,16 @@ namespace Detail {
           (HEFS_INDEX_NODE_DIRECTORY*) mm_new_heap(sizeof(HEFS_INDEX_NODE_DIRECTORY), Yes, No);
 
       while (YES) {
+        if (err_global_get() == kErrorDiskIsCorrupted) {
+          delete dir;
+          dir = nullptr;
+
+          delete node;
+          node = nullptr;
+
+          return nullptr;
+        }
+
         mnt->fPacket.fPacketLba     = start;
         mnt->fPacket.fPacketSize    = sizeof(HEFS_INDEX_NODE_DIRECTORY);
         mnt->fPacket.fPacketContent = dir;
@@ -491,12 +501,16 @@ namespace Detail {
             (Void)(kout << hex_number(node->fHashPath) << kendl);
 
             if (hefsi_hash_64(file_name) == node->fHashPath && node->fKind == kind) {
+              delete dir;
+              dir = nullptr;
+
               return node;
             }
           }
         }
 
         hefsi_traverse_tree(dir, mnt, root->fStartIND, start);
+        if (start == root->fStartIND || start == 0) break;
       }
 
       delete node;
@@ -800,8 +814,8 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* mnt, _Input c
   /// @note all HeFS strucutres are equal to 512, so here it's fine, unless fSectoSize is 2048.
   const SizeT max_lba = drv_std_get_size() / root->fSectorSize;
 
-  const SizeT dir_max   = max_lba / 20;  // 20% for directory inodes
-  const SizeT inode_max = max_lba / 30;  // 30% for inodes
+  const SizeT dir_max   = max_lba / 5;  // 5% for directory inodes
+  const SizeT inode_max = max_lba / 5;  // 5% for inodes
 
   root->fStartIND = mnt->fLbaStart + kHeFSINDStartOffset;
   root->fEndIND   = root->fStartIND + dir_max;
@@ -995,13 +1009,29 @@ _Output Bool HeFileSystemParser::INodeManip(_Input DriveTrait* mnt, VoidPtr bloc
     (Void)(kout << hex_number(start->fOffsetSliceLow) << kendl);
 
     if (start->fOffsetSliceLow) {
-      mnt->fPacket.fPacketLba     = start->fOffsetSliceLow | (UInt64) start->fOffsetSliceHigh << 32;
-      mnt->fPacket.fPacketSize    = block_sz;
+      mnt->fPacket.fPacketLba  = ((UInt64) start->fOffsetSliceHigh << 32) | start->fOffsetSliceLow;
+      mnt->fPacket.fPacketSize = block_sz;
       mnt->fPacket.fPacketContent = block;
 
+      if (mnt->fPacket.fPacketLba > root->fEndBlock) {
+        kout << "Error: Filesystem is full.\r";
+        mm_delete_heap((VoidPtr) root);
+        delete start;
+        return NO;
+      }
+
       if (is_input) {
         mnt->fInput(mnt->fPacket);
       } else {
+        if (start->fFlags & kHeFSFlagsReadOnly) {
+          mm_delete_heap((VoidPtr) root);
+          delete start;
+
+          kout << "Error: File is read-only\r";
+
+          return NO;
+        }
+
         mnt->fOutput(mnt->fPacket);
       }
     }
@@ -1127,35 +1157,47 @@ Boolean fs_init_hefs(Void) {
 
   parser.Format(&kMountPoint, kHeFSEncodingFlagsUTF8, kHeFSDefaultVolumeName);
 
-  MUST_PASS(parser.CreateINode(&kMountPoint, kHeFSEncodingFlagsBinary | kHeFSFlagsReadOnly,
-                               u8"/boot", u8"bootinfo.cfg", kHeFSFileKindRegular));
+  MUST_PASS(parser.CreateINode(&kMountPoint, kHeFSEncodingFlagsUTF8, u8"/boot", u8"bootinfo.cfg~0",
+                               kHeFSFileKindRegular));
+
+  MUST_PASS(parser.CreateINode(&kMountPoint, kHeFSEncodingFlagsUTF8, u8"/boot", u8"bootinfo.cfg~1",
+                               kHeFSFileKindRegular));
+
+  MUST_PASS(parser.CreateINode(&kMountPoint, kHeFSEncodingFlagsUTF8, u8"/boot", u8"bootinfo.cfg~2",
+                               kHeFSFileKindRegular));
 
   Utf8Char contents_1[kHeFSBlockLen] = {0};
 
   urt_set_memory(contents_1, 0, kHeFSBlockLen);
 
-  MUST_PASS(parser.INodeManip(&kMountPoint, contents_1, kHeFSBlockLen, u8"/boot", u8"bootinfo.cfg",
-                              kHeFSFileKindRegular, YES));
+  MUST_PASS(parser.INodeManip(&kMountPoint, contents_1, kHeFSBlockLen, u8"/boot",
+                              u8"bootinfo.cfg~0", kHeFSFileKindRegular, YES));
 
   if (*contents_1 != u'\0') {
-    (Void)(kout << "/boot/bootinfo.cfg:" << kendl);
+    (Void)(kout << "/boot/bootinfo.cfg~0:" << kendl);
     (Void)(kout8 << contents_1 << kendl8);
+
+    MUST_PASS(parser.INodeManip(&kMountPoint, contents_1, kHeFSBlockLen, u8"/boot",
+                                u8"bootinfo.cfg~1", kHeFSFileKindRegular, YES));
+
+    MUST_PASS(parser.INodeManip(&kMountPoint, contents_1, kHeFSBlockLen, u8"/boot",
+                                u8"bootinfo.cfg~2", kHeFSFileKindRegular, YES));
   } else {
     auto src =
-      u8"[boot]\r"
-      u8"path=bootz.efi\r"
-      u8"name=BootZ\r"
-      u8"[kernel]\r"
-      u8"path=krnl.efi\r"
-      u8"name=NeKernel\r"
-      u8"[chk]\r"
-      u8"path=chk.efi\r"
-      u8"name=SysChk\r";
-    
+        u8"[boot]\r"
+        u8"path=bootz.efi\r"
+        u8"name=BootZ\r"
+        u8"[kernel]\r"
+        u8"path=krnl.efi\r"
+        u8"name=NeKernel\r"
+        u8"[chk]\r"
+        u8"path=chk.efi\r"
+        u8"name=SysChk\r";
+
     urt_copy_memory((VoidPtr) src, contents_1, urt_string_len(src));
-    
+
     MUST_PASS(parser.INodeManip(&kMountPoint, contents_1, kHeFSBlockLen, u8"/boot",
-                                u8"bootinfo.cfg", kHeFSFileKindRegular, NO));
+                                u8"bootinfo.cfg~0", kHeFSFileKindRegular, NO));
   }
 
   return YES;
diff --git a/dev/kernel/src/FS/NeFS+FileSystemParser.cc b/dev/kernel/src/FS/NeFS+FileSystemParser.cc
index 683adc7a..0b818bbb 100644
--- a/dev/kernel/src/FS/NeFS+FileSystemParser.cc
+++ b/dev/kernel/src/FS/NeFS+FileSystemParser.cc
@@ -150,8 +150,8 @@ _Output BOOL NeFileSystemParser::CreateFork(_Input NEFS_FORK_STRUCT& the_fork) {
 /// @return the newly found fork.
 /***********************************************************************************/
 _Output NEFS_FORK_STRUCT* NeFileSystemParser::FindFork(_Input NEFS_CATALOG_STRUCT* catalog,
-                                                       _Input const Char*          name,
-                                                       _Input Boolean              is_data) {
+                                                       _Input const Char* name,
+                                                       _Input Boolean     is_data) {
   auto&             drive    = kMountpoint.A();
   NEFS_FORK_STRUCT* the_fork = nullptr;
 
@@ -209,7 +209,7 @@ _Output NEFS_CATALOG_STRUCT* NeFileSystemParser::CreateCatalog(_Input const Char
 /// @param kind the catalog kind.
 /// @return catalog pointer.
 /***********************************************************************************/
-_Output NEFS_CATALOG_STRUCT* NeFileSystemParser::CreateCatalog(_Input const Char*  name,
+_Output NEFS_CATALOG_STRUCT* NeFileSystemParser::CreateCatalog(_Input const Char* name,
                                                                _Input const Int32& flags,
                                                                _Input const Int32& kind) {
   kout << "CreateCatalog(*...*)\r";
diff --git a/dev/kernel/src/IndexableProperty.cc b/dev/kernel/src/IndexableProperty.cc
index 8dd216c8..a89ea92d 100644
--- a/dev/kernel/src/IndexableProperty.cc
+++ b/dev/kernel/src/IndexableProperty.cc
@@ -16,21 +16,13 @@
 
 namespace Kernel {
 namespace Indexer {
-  Index& IndexableProperty::Leak() noexcept {
-    return fIndex;
-  }
+  Index& IndexableProperty::Leak() noexcept { return fIndex; }
 
-  Void IndexableProperty::AddFlag(Int16 flag) {
-    fFlags |= flag;
-  }
+  Void IndexableProperty::AddFlag(Int16 flag) { fFlags |= flag; }
 
-  Void IndexableProperty::RemoveFlag(Int16 flag) {
-    fFlags &= flag;
-  }
+  Void IndexableProperty::RemoveFlag(Int16 flag) { fFlags &= flag; }
 
-  Int16 IndexableProperty::HasFlag(Int16 flag) {
-    return fFlags & flag;
-  }
+  Int16 IndexableProperty::HasFlag(Int16 flag) { return fFlags & flag; }
 
   /// @brief Index a file into the indexer instance.
   /// @param filename filesystem path to access.
diff --git a/dev/modules/Power/PowerFactory.h b/dev/modules/Power/PowerFactory.h
index b9c4b088..4f224709 100644
--- a/dev/modules/Power/PowerFactory.h
+++ b/dev/modules/Power/PowerFactory.h
@@ -27,6 +27,6 @@ class PowerFactory {
 
  public:
   Bool Shutdown() { return NO; };  // shutdown
-  Void Reboot() {};                // soft-reboot
+  Void Reboot(){};                 // soft-reboot
 };
 }  // namespace Kernel
\ No newline at end of file
diff --git a/dev/user/Macros.h b/dev/user/Macros.h
index 0bb98a59..71957208 100644
--- a/dev/user/Macros.h
+++ b/dev/user/Macros.h
@@ -96,7 +96,7 @@ IMPORT_C void _rtl_assert(Bool expr, const Char* origin);
 #endif
 
 #ifndef kib_cast
-#define kib_cast(X) (UInt64)((X) * 1024)
+#define kib_cast(X) (UInt64)((X) *1024)
 #endif
 
 #ifndef MIB
diff --git a/public/frameworks/KernelTest.fwrk/headers/KernelTest.h b/public/frameworks/KernelTest.fwrk/headers/KernelTest.h
index 808d127e..ccb1a903 100644
--- a/public/frameworks/KernelTest.fwrk/headers/KernelTest.h
+++ b/public/frameworks/KernelTest.fwrk/headers/KernelTest.h
@@ -18,18 +18,14 @@
 
 #define KT_TEST_SUCCESS (0)
 
-#define KT_DECL_TEST(NAME, FN)               \
-  class KT_##NAME final {                    \
-   public:                                   \
-    void        Run();                       \
-    const char* ToString();                  \
-  };                                         \
-  inline void KT_##NAME::Run() {             \
-    MUST_PASS(FN() == true);                 \
-  }                                          \
-  inline const char* KT_##NAME::ToString() { \
-    return #FN;                              \
-  }
+#define KT_DECL_TEST(NAME, FN)                                     \
+  class KT_##NAME final {                                          \
+   public:                                                         \
+    void        Run();                                             \
+    const char* ToString();                                        \
+  };                                                               \
+  inline void        KT_##NAME::Run() { MUST_PASS(FN() == true); } \
+  inline const char* KT_##NAME::ToString() { return #FN; }
 
 KT_DECL_TEST(ALWAYS_BREAK, []() -> bool { return false; });
 KT_DECL_TEST(ALWAYS_GOOD, []() -> bool { return true; });
\ No newline at end of file
diff --git a/public/tools/diutil/vendor/Dialogs.h b/public/tools/diutil/vendor/Dialogs.h
index ce50b811..84e239f5 100644
--- a/public/tools/diutil/vendor/Dialogs.h
+++ b/public/tools/diutil/vendor/Dialogs.h
@@ -175,7 +175,7 @@ namespace internal {
 #elif __EMSCRIPTEN__
     void start(int exit_code);
 #else
-    void start_process(std::vector<std::string> const& command);
+    void  start_process(std::vector<std::string> const& command);
 #endif
 
     ~executor();
@@ -490,10 +490,10 @@ inline settings::settings(bool resync) {
 #if _WIN32
   flags(flag::is_vista) = internal::is_vista();
 #elif !__APPLE__
-  flags(flag::has_zenity)     = check_program("zenity");
+  flags(flag::has_zenity) = check_program("zenity");
   flags(flag::has_matedialog) = check_program("matedialog");
-  flags(flag::has_qarma)      = check_program("qarma");
-  flags(flag::has_kdialog)    = check_program("kdialog");
+  flags(flag::has_qarma) = check_program("qarma");
+  flags(flag::has_kdialog) = check_program("kdialog");
 
   // If multiple helpers are available, try to default to the best one
   if (flags(flag::has_zenity) && flags(flag::has_kdialog)) {
@@ -540,7 +540,7 @@ inline bool settings::check_program(std::string const& program) {
   (void) program;
   return false;
 #else
-  int                exit_code = -1;
+  int exit_code = -1;
   internal::executor async;
   async.start_process({"/bin/sh", "-c", "which " + program});
   async.result(&exit_code);
@@ -604,7 +604,7 @@ inline std::string path::home() {
   if (size_max != -1) len = size_t(size_max);
 #endif
   std::vector<char> buf(len);
-  struct passwd     pwd, *result;
+  struct passwd pwd, *result;
   if (getpwuid_r(getuid(), &pwd, buf.data(), buf.size(), &result) == 0) return result->pw_dir;
 #endif
   return "/";
@@ -717,7 +717,7 @@ inline void internal::executor::start_process(std::vector<std::string> const& co
   }
 
   close(in[1]);
-  m_fd       = out[0];
+  m_fd = out[0];
   auto flags = fcntl(m_fd, F_GETFL);
   fcntl(m_fd, F_SETFL, flags | O_NONBLOCK);
 
@@ -753,7 +753,7 @@ inline bool internal::executor::ready(int timeout /* = default_wait_timeout */)
   // FIXME: do something
   (void) timeout;
 #else
-  char    buf[BUFSIZ];
+  char buf[BUFSIZ];
   ssize_t received = read(m_fd, buf, BUFSIZ);  // Flawfinder: ignore
   if (received > 0) {
     m_stdout += std::string(buf, received);
@@ -764,7 +764,7 @@ inline bool internal::executor::ready(int timeout /* = default_wait_timeout */)
   // (this happens when the calling application handles or ignores SIG_CHLD) and results in
   // waitpid() failing with ECHILD. Otherwise we assume the child is running and we sleep for
   // a little while.
-  int   status;
+  int status;
   pid_t child = waitpid(m_pid, &status, WNOHANG);
   if (child != m_pid && (child >= 0 || errno != ECHILD)) {
     // FIXME: this happens almost always at first iteration
@@ -782,7 +782,8 @@ inline bool internal::executor::ready(int timeout /* = default_wait_timeout */)
 
 inline void internal::executor::stop() {
   // Loop until the user closes the dialog
-  while (!ready());
+  while (!ready())
+    ;
 }
 
 // dll implementation
@@ -878,11 +879,11 @@ inline std::vector<std::string> internal::dialog::desktop_helper() const {
 #if __APPLE__
   return {"osascript"};
 #else
-  return {flags(flag::has_zenity)       ? "zenity"
+  return {flags(flag::has_zenity) ? "zenity"
           : flags(flag::has_matedialog) ? "matedialog"
-          : flags(flag::has_qarma)      ? "qarma"
-          : flags(flag::has_kdialog)    ? "kdialog"
-                                        : "echo"};
+          : flags(flag::has_qarma) ? "qarma"
+          : flags(flag::has_kdialog) ? "kdialog"
+                                     : "echo"};
 #endif
 }
 
@@ -1124,9 +1125,9 @@ inline internal::file_dialog::file_dialog(type in_type, std::string const& title
       // Split the pattern list to check whether "*" is in there; if it
       // is, we have to disable filters because there is no mechanism in
       // OS X for the user to override the filter.
-      std::regex                 sep("\\s+");
-      std::string                filter_list;
-      bool                       has_filter = true;
+      std::regex sep("\\s+");
+      std::string filter_list;
+      bool has_filter = true;
       std::sregex_token_iterator iter(patterns.begin(), patterns.end(), sep, -1);
       std::sregex_token_iterator end;
       for (; iter != end; ++iter) {
@@ -1235,7 +1236,7 @@ inline std::vector<std::string> internal::file_dialog::vector_result() {
   return m_vector_result;
 #else
   std::vector<std::string> ret;
-  auto                     result = m_async->result();
+  auto result = m_async->result();
   for (;;) {
     // Split result along newline characters
     auto i = result.find('\n');
@@ -1568,7 +1569,7 @@ inline message::message(std::string const& title, std::string const& text,
         if_cancel = button::ok;
         break;
     }
-    m_mappings[1]   = if_cancel;
+    m_mappings[1] = if_cancel;
     m_mappings[256] = if_cancel;  // XXX: I think this was never correct
     script += " with icon ";
     switch (_icon) {
@@ -1655,7 +1656,7 @@ inline message::message(std::string const& title, std::string const& text,
       if (_choice == choice::yes_no_cancel) flag += "cancel";
       command.push_back(flag);
       if (_choice == choice::yes_no || _choice == choice::yes_no_cancel) {
-        m_mappings[0]   = button::yes;
+        m_mappings[0] = button::yes;
         m_mappings[256] = button::no;
       }
     }
diff --git a/tooling/fsck.hefs.cc b/tooling/fsck.hefs.cc
index 9d67aa38..96cd36b6 100644
--- a/tooling/fsck.hefs.cc
+++ b/tooling/fsck.hefs.cc
@@ -10,7 +10,8 @@
 
 int main(int argc, char** argv) {
   if (argc < 2) {
-    mkfs::console_out() << "fsck: hefs: usage: fsck.hefs i <input_device>" << "\n";
+    mkfs::console_out() << "fsck: hefs: usage: fsck.hefs i <input_device>"
+                        << "\n";
     return EXIT_FAILURE;
   }