fix: kernel: filesystem tweaks.

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

4 files changed, 15 insertions, 17 deletions

diff --git a/dev/kernel/src/DriveMgr.cc b/dev/kernel/src/DriveMgr.cc
index 9f107e97..c94d7476 100644
--- a/dev/kernel/src/DriveMgr.cc
+++ b/dev/kernel/src/DriveMgr.cc
@@ -220,12 +220,11 @@ namespace Detail {
 /// @brief Fetches the main drive.
 /// @return the new drive. (returns kEPMDrive if EPM formatted)
 DriveTrait io_construct_main_drive() noexcept {
-  DriveTrait trait;
-
   constexpr auto kMainDrive = "/media/main/";
 
-  rt_copy_memory((VoidPtr) kMainDrive, trait.fName, rt_string_len(kMainDrive));
+  DriveTrait trait{};
 
+  rt_copy_memory((VoidPtr) kMainDrive, trait.fName, rt_string_len(kMainDrive));
   MUST_PASS(trait.fName[0] != 0);
 
   trait.fVerify   = io_drv_unimplemented;
diff --git a/dev/kernel/src/FS/OpenHeFS+FileMgr.cc b/dev/kernel/src/FS/OpenHeFS+FileMgr.cc
index bb87fd67..3ceb2c4f 100644
--- a/dev/kernel/src/FS/OpenHeFS+FileMgr.cc
+++ b/dev/kernel/src/FS/OpenHeFS+FileMgr.cc
@@ -5,7 +5,7 @@
 ------------------------------------------- */
 
 #ifndef __NE_MINIMAL_OS__
-#ifdef __FSKIT_INCLUDES_HEFS__
+#ifdef __FSKIT_INCLUDES_OPENHEFS__
 
 #include <KernelKit/FileMgr.h>
 #include <KernelKit/HeapMgr.h>
@@ -187,5 +187,5 @@ _Output HeFileSystemParser* HeFileSystemMgr::GetParser() noexcept {
 }
 }  // namespace Kernel
 
-#endif  // ifdef __FSKIT_INCLUDES_HEFS__
+#endif  // ifdef __FSKIT_INCLUDES_OPENHEFS__
 #endif  // ifndef __NE_MINIMAL_OS__
diff --git a/dev/kernel/src/FS/OpenHeFS+FileSystemParser.cc b/dev/kernel/src/FS/OpenHeFS+FileSystemParser.cc
index 3746ebc1..f0f5e81a 100644
--- a/dev/kernel/src/FS/OpenHeFS+FileSystemParser.cc
+++ b/dev/kernel/src/FS/OpenHeFS+FileSystemParser.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#ifdef __FSKIT_INCLUDES_HEFS__
+#ifdef __FSKIT_INCLUDES_OPENHEFS__
 
 #include <FSKit/OpenHeFS.h>
 #include <FirmwareKit/EPM.h>
@@ -1149,13 +1149,15 @@ STATIC DriveTrait kMountPoint;
 
 /// @brief Initialize the OpenHeFS filesystem.
 /// @return To check its status, see err_local_get().
-Boolean OpenHeFS::fs_init_hefs(Void) noexcept {
+Boolean OpenHeFS::fs_init_openhefs(Void) noexcept {
   kout << "Verifying disk...\r";
 
   kMountPoint = io_construct_main_drive();
 
-  if (kMountPoint.fPacket.fPacketReadOnly == YES)
-    ke_panic(RUNTIME_CHECK_FILESYSTEM, "Main disk cannot be mounted (read-only media).");
+  if (kMountPoint.fPacket.fPacketReadOnly == YES) {
+    kout << "Main disk cannot be mounted (read-only media).\r";
+    return NO;
+  }
 
   HeFileSystemParser parser;
 
@@ -1163,4 +1165,4 @@ Boolean OpenHeFS::fs_init_hefs(Void) noexcept {
 }
 }  // namespace Kernel
 
-#endif  // ifdef __FSKIT_INCLUDES_HEFS__
+#endif  // ifdef __FSKIT_INCLUDES_OPENHEFS__
diff --git a/dev/kernel/src/UserMgr.cc b/dev/kernel/src/UserMgr.cc
index 5ee2aa33..fac6a3d0 100644
--- a/dev/kernel/src/UserMgr.cc
+++ b/dev/kernel/src/UserMgr.cc
@@ -89,14 +89,11 @@ Bool User::Save(const UserPublicKey password) noexcept {
 Bool User::Login(const UserPublicKey password) noexcept {
   if (!password || !*password) return No;
 
-  // now check if the password matches.
-  if (this->mUserFNV == Detail::user_fnv_generator(password, this)) {
-    kout << "User::Login: Password matches.\r";
-    return Yes;
-  }
+  auto ret = this->mUserFNV == Detail::user_fnv_generator(password, this);
 
-  kout << "User::Login: Password doesn't match.\r";
-  return No;
+  // now check if the password matches.
+  kout << (ret ? "User::Login: Password matches.\r" : "User::Login: Password doesn't match.\r");
+  return ret;
 }
 
 Bool User::operator==(const User& lhs) {