Coded umount, tried aesthetic theme, cleaned up sh, cleaned up mount code.

Author: pradosh-arduino

disk.img

@@ -36,5 +36,6 @@ int cmd_clear(int argc, char** argv);
 int cmd_lsblk(int argc, char** argv);
 int cmd_mount(int argc, char** argv);
 int cmd_mv(int argc, char** argv);
+int cmd_umount(int argc, char** argv);
 
 #endif

source/includes/commands/commands.h

@@ -27,6 +27,14 @@
 #define green_color  "\x1b[32m"
 #define orange_color "\x1b[38;5;208m"
 
+// #define reset_color  "\x1b[38;5;248m"
+// #define red_color    "\x1b[38;5;167m"
+// #define yellow_color "\x1b[38;5;179m"
+// #define blue_color   "\x1b[38;5;75m"
+// #define green_color  "\x1b[38;5;71m"
+// #define orange_color "\x1b[38;5;172m"
+
+
 extern string last_filename;
 extern string last_filename; // for warn, info, err, done
 extern string last_print_file;

source/includes/graphics.h

@@ -189,7 +189,7 @@ mount_entry_t* add_mount(const char* mount_point, const char* part_name, partiti
         return NULL;
     }
 
-    mount_entry_t* new_mount = kmalloc(sizeof(mount_entry_t));
+    mount_entry_t* new_mount = &mounted_partitions[mounted_partition_count];
     if(!new_mount) return NULL;
 
     new_mount->mount_point = strdup(mount_point);
@@ -205,6 +205,42 @@ mount_entry_t* add_mount(const char* mount_point, const char* part_name, partiti
     return new_mount;
 }
 
+int remove_mount(const char* mount_point)
+{
+    if (!mount_point)
+        return -1;
+
+    for (int i = 0; i < mounted_partition_count; i++) {
+        mount_entry_t* m = &mounted_partitions[i];
+
+        if (strcmp(m->mount_point, mount_point) == 0) {
+
+            /* Free allocated strings */
+            if (m->mount_point)
+                kfree(m->mount_point);
+            if (m->part_name)
+                kfree(m->part_name);
+
+            /* Shift remaining mounts left */
+            for (int j = i; j < mounted_partition_count - 1; j++) {
+                mounted_partitions[j] = mounted_partitions[j + 1];
+            }
+
+            mounted_partition_count--;
+
+            /* Clear last slot (debug safety) */
+            memset(&mounted_partitions[mounted_partition_count], 0,
+                   sizeof(mount_entry_t));
+
+            return 0;
+        }
+    }
+
+    printf("umount: %s: not mounted", mount_point);
+    return -2;
+}
+
+
 mount_entry_t* find_mount_by_point(const char* mount_point)
 {
     for(int i = 0; i < mounted_partition_count; i++){

source/kernel/C/ahci.c

@@ -62,6 +62,34 @@ int fat16_mount(int portno, uint32_t partition_lba, fat16_fs_t* fs) {
     return FAT_OK;
 }
 
+void fat16_unmount(fat16_fs_t* fs)
+{
+    if (!fs)
+        return;
+
+    /*
+     * FAT16 has no runtime state that must be flushed
+     * because:
+     *  - FAT updates are written immediately
+     *  - directory entries are written immediately
+     *  - no write-back cache exists
+     */
+
+    /* Clear sensitive fields (debug-friendly) */
+    fs->portno = 0;
+    fs->partition_lba = 0;
+    fs->fat_start = 0;
+    fs->root_dir_start = 0;
+    fs->data_start = 0;
+    fs->root_dir_sectors = 0;
+
+    memset(&fs->bs, 0, sizeof(fs->bs));
+
+    /* NOTE:
+     * fs memory is freed by umount(), not here
+     */
+}
+
 uint16_t fat16_read_fat_fs(fat16_fs_t* fs, uint16_t cluster) {
     uint8_t buf[512];
     uint32_t offset = cluster * 2;

source/kernel/C/filesystems/fat16.c

@@ -62,7 +62,7 @@ static int proc_heap_read(
 
     char tmp[128];
     int len = snprintf(tmp, sizeof(tmp),
-        "HeapTotal: %u bytes\nHeapUsed: %u bytes\nHeapFree: %u bytes\nAllocCount: %u",
+        "HeapTotal: %u bytes\nHeapUsed: %u bytes\nHeapFree: %u bytes\nAllocCount: %d",
         (heap_end - heap_begin),
         (memory_used),
         (heap_end - last_alloc),

source/kernel/C/filesystems/layers/proc.c

@@ -33,7 +33,7 @@ static int path_matches_mount(const char* path, const char* mount) {
     return path[mlen] == '\0' || path[mlen] == '/';
 }
 
-static int vfs_resolve_mount(const char* path, vfs_mount_res_t* out) {
+int vfs_resolve_mount(const char* path, vfs_mount_res_t* out) {
     if (!path || !out) {
         eprintf("resolve_mount: invalid arguments");
         return -1;
@@ -191,6 +191,13 @@ int vfs_ls(const char* path)
         }
     }
 
+    if(res.mnt->type == FS_PROC) {
+        if (res.rel_path[0] == '\0') {
+            procfs_ls();
+            entries = true;
+        }
+    }
+
     if (res.mnt->type == FS_FAT16) {
         fat16_fs_t* fs = (fat16_fs_t*)res.mnt->fs;
 
@@ -215,13 +222,6 @@ int vfs_ls(const char* path)
         }
     }
 
-    if(res.mnt->type == FS_PROC) {
-        if (res.rel_path[0] == '\0') {
-            procfs_ls();
-            entries = true;
-        }
-    }
-
     if(entries)
         print("\n");
     return 0;

source/kernel/C/filesystems/vfs.c

@@ -29,6 +29,14 @@ int cmd_mount(int argc, char** argv)
     const char* device = argv[1];
     const char* mount_point = argv[2];
 
+    if(strcmp(mount_point, "/") != 0) {
+        vfs_mount_res_t res;
+        if (vfs_resolve_mount("/", &res) != 0){
+            eprintf("mount: cannot mount block device, root (/) is not mounted.");
+            return -2;
+        }
+    }
+
     if(strcmp(device, "proc") == 0){
         mount_entry_t* new_mount = add_mount(mount_point, device, FS_PROC, NULL);
         if (!new_mount)

source/kernel/C/shell/commands/mount.c

@@ -0,0 +1,61 @@
+/**
+ * @file umount.c
+ * @author Pradosh ([email protected])
+ * @brief 
+ * @version 0.1
+ * @date 2026-01-06
+ * 
+ * @copyright Copyright (c) Pradosh 2026
+ * 
+ */
+
+#include <commands/commands.h>
+#include <ahci.h>
+#include <filesystems/fat16.h>
+#include <strings.h>
+
+int cmd_umount(int argc, char** argv)
+{
+    if (argc < 2) {
+        printf("Usage: umount <mount_point>");
+        return 1;
+    }
+
+    const char* mount_point = argv[1];
+
+    /* Never allow root unmount */
+    if (strcmp(mount_point, "/") == 0)
+        printf("umount: warn unmounting root filesystem");
+
+    mount_entry_t* m = find_mount_by_point(mount_point);
+    if (!m) {
+        printf("umount: %s: not mounted", mount_point);
+        return 1;
+    }
+
+    /* Filesystem-specific cleanup */
+    switch (m->type) {
+        case FS_FAT16:
+            if (m->fs) {
+                fat16_unmount((fat16_fs_t*)m->fs);
+                kfree(m->fs);
+            }
+            break;
+
+        case FS_PROC:
+            // procfs_shutdown(); /* or procfs_unmount() */
+            break;
+
+        default:
+            printf("umount: unsupported filesystem");
+            return 1;
+    }
+
+    if (remove_mount(mount_point) != 0) {
+        printf("umount: failed to remove mount");
+        return 1;
+    }
+
+    printf("umount: %s unmounted", mount_point);
+    return 0;
+}

source/kernel/C/shell/commands/umount.c

@@ -67,24 +67,24 @@ void push_command_to_list(command_list* lst, const char* value, size_t length)
 bool running = true;
 
 void welcome_message(){
-    print("\e[1;34m ______             _           _  _____ _          _ _ \n");
-    printf("|  ____|           | |         | |/ ____| |        | | |");
-    printf("| |__ _ __ ___  ___| |_ ___  __| | (___ | |__   ___| | |");
-    printf("|  __| '__/ _ \\/ __| __/ _ \\/ _` |\\___ \\| '_ \\ / _ \\ | |");
-    printf("| |  | | | (_) \\__ \\ ||  __/ (_| |____) | | | |  __/ | |");
-    print("|_|  |_|  \\___/|___/\\__\\___|\\__,_|_____/|_| |_|\\___|_|_|\e[0m\n\n");
-
-    print("\033[1;32mWelcome to frosted shell!\033[0m This is an implementation of \033[0;34msh\033[0m.\n");
-    print("We as the developers try to make this shell as similar as \033[0;34msh\033[0m.\n\n");
-
-    print("Website : \e[1;34mhttps://prad.digital\033[0m\n");
-    print("Wiki    : \e[1;34mhttps://github.com/Frost-Wing/osdev/wiki\033[0m\n");
-    print("Github  : \e[1;34mhttps://github.com/Frost-Wing\033[0m\n\n");
-    
+    printf(blue_color " ______             _           _  _____ _          _ _ ");
+    printf(blue_color "|  ____|           | |         | |/ ____| |        | | |");
+    printf(blue_color "| |__ _ __ ___  ___| |_ ___  __| | (___ | |__   ___| | |");
+    printf(blue_color "|  __| '__/ _ \\/ __| __/ _ \\/ _` |\\___ \\| '_ \\ / _ \\ | |");
+    printf(blue_color "| |  | | | (_) \\__ \\ ||  __/ (_| |____) | | | |  __/ | |");
+    printf(blue_color "|_|  |_|  \\___/|___/\\__\\___|\\__,_|_____/|_| |_|\\___|_|_|" reset_color "\n");
+
+    printf(green_color "Welcome to frosted shell!" reset_color " This is an implementation of " blue_color "sh" reset_color ".");
+    printf("We as the developers try to make this shell as similar as " blue_color "sh" reset_color ".\n");
+
+    printf("Wiki    : " blue_color "https://github.com/Frost-Wing/osdev/wiki" reset_color "");
+    printf("Github  : " blue_color "https://github.com/Frost-Wing" reset_color "\n");
+
     uint8_t second, minute, hour, day, month, year;
     update_system_time(&second, &minute, &hour, &day, &month, &year);
 
-    printf("Time    : %d:%d:%d %d/%d/%d", hour, minute, second, day, month, year);
+    printf("Time    : %02d:%02d:%02d %02d/%02d/%02d",
+           hour, minute, second, day, month, year);
 }
 
 extern int64* wm_addr;
@@ -393,7 +393,8 @@ static command_t commands[] = {
     { "lspci", cmd_lspci },
     { "lsblk", cmd_lsblk },
     { "mount", cmd_mount },
-    { "mv", cmd_mv }
+    { "mv", cmd_mv },
+    { "umount", cmd_umount }
     // { "fwfetch", cmd_fwfetch },
     // { "help", cmd_help },
 };