Shell: NEW COMMAND PARSER!!!

StdIO: Copy file name to prevent hijacking (memory overwriting)

common.mk

@@ -168,6 +168,7 @@ SOURCES=\
 	kernel/src/sys/lapic.c \
 	kernel/src/drv/ps2.c \
 	kernel/src/drv/video/intel.c \
+	kernel/src/extra/command_parser.c \
 	kernel/src/kernel.c \
 #	kernel/src/lib/duktape.c \
 	kernel/src/toys/piano.c \

kernel/include/lib/command_parser.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include "common.h"
+
+typedef struct {
+	char* original_string;
+	int argc;
+	char** argv;
+} command_parser_t;
+
+void command_parser_new(command_parser_t* parser, const char* _s);
+void command_parser_destroy(command_parser_t* parser);
+

kernel/include/sys/file_descriptors.h

@@ -17,4 +17,4 @@ size_t file_descriptor_read(int descriptor_number, size_t count, void* buffer);
 size_t file_descriptor_write(int descriptor_number, size_t count, const void* buffer);
 size_t file_descriptor_close(int descriptor_number);
 size_t file_descriptor_seek(int descriptor_number, ssize_t value, size_t whence);
-void file_descriptor_tell(int descriptor_number, int* out);
+size_t file_descriptor_tell(int descriptor_number, int* out);

kernel/src/extra/cli.c

@@ -30,6 +30,7 @@
 #include "../../include/lib/fileio.h"
 #include "sys/system.h"
 #include "debug/hexview.h"
+#include "lib/command_parser.h"
 
 int G_CLI_CURINXA = 0;
 int G_CLI_CURINXB = 0;
@@ -287,7 +288,7 @@ uint32_t CLI_CMD_SET(uint32_t c, char* v[]){
 }
 
 uint32_t CLI_CMD_DIR(uint32_t c, char* v[]) {
-    const char* path = (c <= 1 ? G_CLI_PATH : v[1]);
+    const char* path = (c <= 2 ? G_CLI_PATH : v[1]);
 
 	FSM_DIR* Dir = nvfs_dir(path);
 	if (Dir->Ready != 1){
@@ -318,7 +319,7 @@ uint32_t CLI_CMD_DIR(uint32_t c, char* v[]) {
 }
 
 uint32_t CLI_CMD_RUN(uint32_t c, char* v[]) {
-    if (c == 0){
+    if (c <= 2){
         //tty_setcolor(COLOR_ERROR);
         tty_printf("Файл не указан.\n");
         return 1;
@@ -342,7 +343,7 @@ uint32_t CLI_CMD_RUN(uint32_t c, char* v[]) {
 
     fclose(elf_exec);
 
-    run_elf_file(path, c - 1, v);
+    run_elf_file(path, c, v);
 
     return 0;
 }
@@ -647,35 +648,37 @@ CLI_CMD_ELEM G_CLI_CMD[] = {
 void cli_handler(const char* ncmd){
 	set_cursor_enabled(0);
 
-	uint32_t argc = str_cdsp(ncmd," ") + 1;
-    char* argv[128] = {0};
+	command_parser_t parser = {};
 
-    str_split(ncmd, argv, " ");
+	command_parser_new(&parser, ncmd);
 
-	for(size_t i = 0; i < argc; i++){
-		qemu_log("[CLI] '%s' => argc: %d => argv: %s", ncmd, i, argv[i]);
-    }
+	for(size_t i = 0; i < parser.argc; i++){
+		qemu_log("[CLI] '%s' => argc: %d => argv: %s", ncmd, i, parser.argv[i]);
+    	}
 
 	bool found = false;
 
 	for(size_t i = 0; G_CLI_CMD[i].name != nullptr; i++) {
-		if(strcmpn(G_CLI_CMD[i].name, argv[0]) || strcmpn(G_CLI_CMD[i].alias, argv[0])) {
-			G_CLI_CMD[i].funcv(argc, argv);
+		if(strcmpn(G_CLI_CMD[i].name, parser.argv[0]) || strcmpn(G_CLI_CMD[i].alias, parser.argv[0])) {
+			G_CLI_CMD[i].funcv(parser.argc, parser.argv);
 			found = true;
 			break;
 		}
 	}
+
 	if(!found) {
-		CLI_CMD_RUN(argc + 1, argv);
+		CLI_CMD_RUN(parser.argc, parser.argv);
 	}
 
+	command_parser_destroy(&parser);
+
 	set_cursor_enabled(1);
 }
 
 void cli(){
 	qemu_log("[CLI] Started...");
 	tty_set_bgcolor(0xFF000000);
-    tty_setcolor(0xFFFFFF);
+	tty_setcolor(0xFFFFFF);
 
 	variable_write("HOSTNAME", "SAYORISOUL");
 	variable_write("SYSTEMROOT", "R:\\Sayori\\");
@@ -690,28 +693,28 @@ void cli(){
 
 	punch();
 
-	char* input_buffer = kcalloc(1, 256);
+	char* input_buffer = kcalloc(1, 512);
 	while(1) {
 		size_t memory_cur = system_heap.used_memory;
-        size_t memory_cnt_cur = system_heap.allocated_count;
+        	size_t memory_cnt_cur = system_heap.allocated_count;
 
-    	tty_setcolor(0xFFFFFF);
+    		tty_setcolor(0xFFFFFF);
 		tty_printf("%s>", G_CLI_PATH);
-		memset(input_buffer, 0, 256);
+		memset(input_buffer, 0, 512);
 
-        int result = gets_max(input_buffer, 255);
+		int result = gets_max(input_buffer, 512);
 
-        if(result == 1) {
-            tty_alert("\nMaximum 255 characters!\n");
-            continue;
-        }
+        	if(result == 1) {
+            		tty_alert("\nMaximum 512 characters!\n");
+            		continue;
+        	}
 
-        size_t len_cmd = strlen(input_buffer);
-        if (len_cmd == 0) {
-            continue;
-        }
+        	size_t len_cmd = strlen(input_buffer);
+        	if (len_cmd == 0) {
+            		continue;
+		}
 
-        size_t current_time = timestamp();
+        	size_t current_time = timestamp();
 		qemu_log("cmd: %s", input_buffer);
 
 		cli_handler(input_buffer);
@@ -729,7 +732,7 @@ void cli(){
 			qemu_ok("All right! No memory leaks! Keep it up, buddy!");
 		}
 
-        qemu_note("Time elapsed: %d milliseconds", timestamp() - current_time);
+		qemu_note("Time elapsed: %d milliseconds", timestamp() - current_time);
 	}
 
     kfree(input_buffer);

kernel/src/extra/command_parser.c

@@ -0,0 +1,70 @@
+#include "lib/command_parser.h"
+#include "mem/vmm.h"
+
+void command_parser_new(command_parser_t* parser, const char* _s) {
+	if(!parser) {
+		return;
+	}
+
+	parser->original_string = kcalloc(strlen(_s) + 1, 1);
+	memcpy(parser->original_string, _s, strlen(_s));
+
+	parser->argc = 0;
+
+
+	char* ptr = parser->original_string;
+	// Count arguments
+	while(*ptr++ == ' ')
+		;
+	while(*ptr++) {
+		if(*ptr == ' ' || *ptr == 0) {
+			if(parser->original_string != ptr - 1) {
+				parser->argc++;
+			}
+
+			while(*ptr++ == ' ')
+				;
+		}
+	}
+
+
+	parser->argv = kcalloc(parser->argc, sizeof(char*));
+
+	char* prev = parser->original_string;
+	ptr = prev;
+
+	size_t cur = 0;
+
+	// Parse
+	while(*ptr++ == ' ')
+		;
+
+	prev = ptr - 1;
+	while(*ptr++) {
+		if(*ptr == ' ' || *ptr == 0) {
+			size_t len = ptr - prev;
+
+			parser->argv[cur] = kcalloc(len + 1, 1);
+
+			memcpy(parser->argv[cur], prev, len);
+
+			cur++;
+
+			while(*ptr++ == ' ')
+				;
+
+			prev = --ptr;
+		}
+	}
+}
+
+void command_parser_destroy(command_parser_t* parser) {
+	kfree(parser->original_string);
+
+	for(int i = 0; i < parser->argc; i++) {
+		kfree(parser->argv[i]);
+	}
+
+	kfree(parser->argv);
+}
+

kernel/src/fs/nvfs.c

@@ -18,8 +18,7 @@
 #include "fs/fsm.h"
 #include "lib/php/str_replace.h"
 
-bool nvfs_debug = false;
-
+bool nvfs_debug = true;
 
 NVFS_DECINFO* nvfs_decode(const char* Name) {
 	NVFS_DECINFO* info = kcalloc(sizeof(NVFS_DECINFO), 1);
@@ -79,6 +78,10 @@ NVFS_DECINFO* nvfs_decode(const char* Name) {
 }
 
 size_t nvfs_read(const char* Name, size_t Offset, size_t Count, void* Buffer){
+	if(nvfs_debug) {
+		qemu_log("Name=%s", Name);
+	}
+
 	NVFS_DECINFO* vinfo = nvfs_decode(Name);
 	size_t res = 0;
 

kernel/src/lib/stdio.c

@@ -194,10 +194,12 @@ FILE* fopen_binmode(const char* filename, size_t mode) {
        file->open = 1;                                                                         // Файл успешно открыт
        file->fmode = mode;                                                               // Режим работы с файлом
        file->size = finfo.Size;                // Размер файла
-       file->path = (char*)filename;                                           // Полный путь к файлу
+       file->path = kcalloc(strlen(filename) + 1, 1);                                           // Полный путь к файлу
        file->pos = 0;                                                                          // Установка указателя в самое начало
        file->err = 0;                                                                          // Ошибок в работе нет
 
+	memcpy(file->path, filename, strlen(filename));
+
        qemu_ok("File opened!");
 
        return file;
@@ -209,8 +211,10 @@ FILE* fopen_binmode(const char* filename, size_t mode) {
  * @param stream Поток (файл)
  */
 void fclose(FILE* stream){
-	if(stream)
+	if(stream) {
+		kfree(stream->path);
 		kfree(stream);
+	}
 }
 
 /**

kernel/src/sys/file_descriptors.c

@@ -158,17 +158,18 @@ size_t file_descriptor_seek(int descriptor_number, ssize_t value, size_t whence)
 
 }
 
-void file_descriptor_tell(int descriptor_number, int* out) {
-    if(descriptor_number < 0 || descriptor_number >= last_descriptor_number)
-        return;
+size_t file_descriptor_tell(int descriptor_number, int* out) {
+	if(descriptor_number < 0 || descriptor_number >= last_descriptor_number) {
+		return 0;
+	}
 
-    for(int i = 0; i < descriptors->size; i++) {
-        struct fd_info *inf = (struct fd_info *) vector_get(descriptors, i).element;
+	if(!file_descriptor_get(descriptor_number)) {
+        	return 0;
+    	}
 
-        if (inf->fd == descriptor_number) {
-            *out = ftell(inf->file);
+	struct fd_info* inf = file_descriptor_get(descriptor_number);
 
-            return;
-        }
-    }
+	*out = ftell(inf->file);
+
+	return 0;
 }