Several things

Sorry :D

4 files changed, 18 insertions, 5 deletions

diff --git a/apps/exec.c b/apps/exec.c
index 726544d..e7cfcd8 100644
--- a/apps/exec.c
+++ b/apps/exec.c
@@ -30,6 +30,7 @@ void on_submit(struct gui_event_keyboard *event, struct element *elem)
 
 	u8 l = strlen(PATH) + strlen(inp) + 1;
 	char *final = malloc(l);
+	final[0] = '\0';
 	strcat(final, PATH);
 	strcat(final, inp);
 
diff --git a/boot/entry.asm b/boot/entry.asm
index cf632b1..1f421ea 100644
--- a/boot/entry.asm
+++ b/boot/entry.asm
@@ -238,7 +238,7 @@ video_map:
 disk_error_msg db "Disk error!", NEWLINE, RETURN, NULL
 lba_error_msg db "LBA error!", NEWLINE, RETURN, NULL
 video_error_msg db "Video error!", NEWLINE, RETURN, NULL
-found_msg db "FOUND!", NEWLINE, RETURN, NULL
+found_msg db "Found file!", NEWLINE, RETURN, NULL
 
 ; Filenames
 loader_name db "load.bin"
@@ -310,7 +310,7 @@ stage_two:
 .found:
 	mov si, found_msg
 	call print ; Print success message
-	mov ax, word [bx + EXT2_INODE_OFFSET] ; Get inode number from dirent
+	mov ax, [bx + EXT2_INODE_OFFSET] ; Get inode number from dirent
 	; Calculate address: (EXT2_INODE_TABLE_LOC + (inode - 1) * EXT2_INODE_SIZE)
 	dec ax ; (inode - 1)
 	mov cx, EXT2_INODE_SIZE ; Prepare for multiplication
@@ -320,6 +320,8 @@ stage_two:
 	mov cx, [bx + EXT2_COUNT_OFFSET] ; Number of blocks for inode
 	cmp cx, 0
 	je disk_error
+	cmp cx, 256 + 12 ; BLOCK_SIZE / sizeof(u32) = 256
+	jge disk_error
 	lea di, [bx + EXT2_POINTER_OFFSET] ; Address of first block pointer
 	mov bx, 0x4000 ; Load to this address
 	mov [dest + 2], bx
diff --git a/kernel/features/fs.c b/kernel/features/fs.c
index e168022..670a195 100644
--- a/kernel/features/fs.c
+++ b/kernel/features/fs.c
@@ -20,8 +20,7 @@ struct device *vfs_mounted(const char *path)
 	struct node *iterator = mount_points->head;
 	while (iterator) {
 		struct mount_info *m = iterator->data;
-		printf("Looping %s\n", m->path);
-		if (!strcmp(m->path, path))
+		if (!strncmp(m->path, path, strlen(m->path)))
 			return m->dev;
 		iterator = iterator->next;
 	}
@@ -41,6 +40,16 @@ u32 vfs_mount(struct device *dev, const char *path)
 	return 1;
 }
 
+void vfs_list_mounts()
+{
+	struct node *iterator = mount_points->head;
+	while (iterator) {
+		struct mount_info *m = iterator->data;
+		printf("%s on %s type: %s\n", m->dev->name, m->path, m->dev->vfs->name);
+		iterator = iterator->next;
+	}
+}
+
 void vfs_install(void)
 {
 	mount_points = list_new();
@@ -80,6 +89,7 @@ void device_install(void)
 	dev->vfs = vfs;
 	device_add(dev);
 	vfs_mount(dev, "/dev/");
+	vfs_list_mounts();
 }
 
 /**
diff --git a/kernel/inc/fs.h b/kernel/inc/fs.h
index 8fd0707..e2a3aad 100644
--- a/kernel/inc/fs.h
+++ b/kernel/inc/fs.h
@@ -27,7 +27,7 @@ void device_install(void);
 struct vfs {
 	const char *name;
 	//u8 (*read)(char *, char *, struct device *, void *);
-	u8 (*mount)(struct device *, void *);
+	//u8 (*mount)(struct device *, void *);
 };
 
 struct mount_info {