Fixed a lot of displaying issues, fixed mount doing multiple times.

Author: pradosh-arduino

disk.img

@@ -117,4 +117,6 @@ int vfs_unlink(const char* path);
  */
 const char* vfs_getcwd();
 
+const char* vfs_basename(const char* path);
+
 #endif // VFS_H

source/includes/filesystems/vfs.h

@@ -171,7 +171,23 @@ general_partition_t* search_general_partition(cstring partition_name) {
 
 mount_entry_t* add_mount(const char* mount_point, const char* part_name, partition_fs_type_t type, void* fs_ptr)
 {
-    if (mounted_partition_count >= MAX_PARTITIONS) return NULL;
+    if (!mount_point || !part_name) return NULL;
+
+    for (int i = 0; i < mounted_partition_count; i++) {
+        if (strcmp(mounted_partitions[i].mount_point, mount_point) == 0) {
+            printf("mount: mount point '%s' already in use", mount_point);
+            return NULL;
+        }
+        if (strcmp(mounted_partitions[i].part_name, part_name) == 0) {
+            printf("mount: partition '%s' already mounted", part_name);
+            return NULL;
+        }
+    }
+
+    if (mounted_partition_count >= MAX_PARTITIONS) {
+        printf("mount: maximum number of mounts reached");
+        return NULL;
+    }
 
     mount_entry_t* new_mount = kmalloc(sizeof(mount_entry_t));
     if(!new_mount) return NULL;
@@ -202,11 +218,11 @@ mount_entry_t* find_mount_by_point(const char* mount_point)
 void list_all_mounts()
 {
     if(mounted_partition_count == 0){
-        printf("No mounted partitions.");
+        printf("no mounted partitions.");
         return;
     }
 
-    printf(yellow_color "Mounted partitions :" reset_color);
+    printf(yellow_color "mounted partitions :" reset_color);
     for(int i = 0; i < mounted_partition_count; i++){
         mount_entry_t* mnt = &mounted_partitions[i];
         printf("  [%d] %s -> %s (FS Type: %d)", i, mnt->part_name, mnt->mount_point, mnt->type);

source/kernel/C/ahci.c

@@ -75,8 +75,7 @@ int fat16_mount(int portno, uint32_t partition_lba, fat16_fs_t* fs) {
     fs->fat_start = partition_lba + bs->reserved_sectors;
     fs->root_dir_start = fs->fat_start + (bs->num_fats * bs->sectors_per_fat);
     fs->data_start = fs->root_dir_start + fs->root_dir_sectors;
-
-    printf("mount: successfully mounted FAT16 partition");
+    
     return FAT_OK;
 }
 
@@ -372,14 +371,14 @@ void fat16_format_name(const char* input, char out[11]) {
 
     // name
     while (input[i] && input[i] != '.' && j < 8)
-        out[j++] = toupper(input[i++]);
+        out[j++] = (input[i++]);
 
     // extension
     if (input[i] == '.') {
         i++;
         j = 8;
         while (input[i] && j < 11)
-            out[j++] = toupper(input[i++]);
+            out[j++] = (input[i++]);
     }
 }
 

source/kernel/C/filesystems/fat16.c

@@ -56,9 +56,9 @@ static int vfs_resolve_mount(const char* path, vfs_mount_res_t* out) {
 
     if (!best) {
         if(path)
-            printf("no mount matches path: %s", path);
+            printf("resolve_mount: no mount matches path: %s", path);
         else
-            printf("no mount matches the given path.");
+            printf("resolve_mount: no mount matches the given path.");
         return -2;
     }
 
@@ -153,42 +153,53 @@ void vfs_close(vfs_file_t* file) {
         fat16_close(&file->f);
 }
 
-int vfs_ls(const char* path) {
+int vfs_ls(const char* path)
+{
     if (!path) {
-        printf("ls: invalid path passed");
+        printf("ls: invalid path");
         return -1;
     }
 
+    char norm[256];
+    vfs_normalize_path(path, norm);
+
     vfs_mount_res_t res;
-    if (vfs_resolve_mount(path, &res) != 0)
+    if (vfs_resolve_mount(norm, &res) != 0)
         return -1;
 
-    if (res.mnt->type == FS_FAT16){
+    int listed_anything = 0;
+
+    for (int i = 0; i < mounted_partition_count; i++) {
+        mount_entry_t* m = &mounted_partitions[i];
+
+        if (vfs_is_direct_child_mount(norm, m)) {
+            const char* name = vfs_basename(m->mount_point);
+            printfnoln(yellow_color "%s " reset_color, name);
+        }
+    }
+
+    if (res.mnt->type == FS_FAT16) {
         fat16_fs_t* fs = (fat16_fs_t*)res.mnt->fs;
 
         if (*res.rel_path == '\0') {
             fat16_list_root(fs);
-            return 0;
-        }
+        } else {
+            fat16_dir_entry_t e;
+            if (fat16_find_path(fs, res.rel_path, &e) != 0) {
+                printf("ls: path not found");
+                return -3;
+            }
 
-        fat16_dir_entry_t e;
-        if (fat16_find_path(fs, res.rel_path, &e) != 0) {
-            printf("ls: path not found");
-            return -3;
-        }
+            if (!(e.attr & 0x10)) {
+                printf("ls: not a directory");
+                return -4;
+            }
 
-        if (!(e.attr & 0x10)) {
-            printf("ls: not a directory");
-            return -4;
+            fat16_list_dir_cluster(fs, e.first_cluster);
         }
-
-        fat16_list_dir_cluster(fs, e.first_cluster);
-
-        return 0;
     }
-    
-    printf("ls: unknown filesystem");
-    return -2;
+
+    return 0;
 }
 
 int vfs_open(const char* path, vfs_file_t* out) {
@@ -440,4 +451,33 @@ int vfs_mv(const char* src, const char* dst)
 
 const char* vfs_getcwd(void) {
     return vfs_cwd;
+}
+
+int vfs_is_direct_child_mount(const char* parent, mount_entry_t* m) {
+    if (!strcmp(parent, "/")) {
+        if (m->mount_point[0] != '/')
+            return 0;
+        /* Only one slash allowed */
+        const char* rest = m->mount_point + 1;
+        return strchr(rest, '/') == NULL;
+    }
+
+    size_t plen = strlen(parent);
+    if (strncmp(m->mount_point, parent, plen) != 0)
+        return 0;
+
+    if (m->mount_point[plen] != '/')
+        return 0;
+
+    return strchr(m->mount_point + plen + 1, '/') == NULL;
+}
+
+const char* vfs_basename(const char* path) {
+    const char* last = path;
+    while (*path) {
+        if (*path == '/')
+            last = path + 1;
+        path++;
+    }
+    return last;
 }

source/kernel/C/filesystems/vfs.c

@@ -42,6 +42,10 @@ int cmd_mount(int argc, char** argv)
                 printf("mount: memory allocation failed.");
                 return 1;
             }
+            mount_entry_t* new_mount = add_mount(mount_point, device, partition->fs_type, fs_struct);
+            if (!new_mount)
+                return 1;
+
             ret = fat16_mount(partition->ahci_port, partition->lba_start, (fat16_fs_t*)fs_struct);
             break;
 
@@ -55,12 +59,6 @@ int cmd_mount(int argc, char** argv)
         return 1;
     }
 
-    mount_entry_t* new_mount = add_mount(mount_point, device, partition->fs_type, fs_struct);
-    if (!new_mount) {
-        printf("mount: add_mount failed.");
-        return 1;
-    }
-
-    printf("Mounted %s at %s", device, mount_point);
+    printf("mount: mounted %s at %s", device, mount_point);
     return 0;
 }

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

@@ -530,3 +530,15 @@ char* strrchr(const char* s, int c) {
     if (c == 0) return (char*)s; // null terminator
     return last;
 }
+
+/* Find first occurrence of character c in string s */
+char* strchr(const char* s, int c) {
+    while (*s) {
+        if (*s == (char)c)
+            return (char*)s;  // cast away const
+        s++;
+    }
+    if (c == '\0')  // special case: searching for null terminator
+        return (char*)s;
+    return NULL;
+}