From b0c53f6c83b0370c7d8a8e0315136b90ac917554 Mon Sep 17 00:00:00 2001
From: Alexander Myltsev <a.myltsev@gmail.com>
Date: Tue, 13 Dec 2022 19:06:51 +0300
Subject: [PATCH] Move string.[ch] to lib/.

---
 drivers/vga.c            | 2 +-
 fs/fs.c                  | 2 +-
 kernel.c                 | 8 ++++++--
 string.c => lib/string.c | 0
 string.h => lib/string.h | 0
 5 files changed, 8 insertions(+), 4 deletions(-)
 rename string.c => lib/string.c (100%)
 rename string.h => lib/string.h (100%)

diff --git a/drivers/vga.c b/drivers/vga.c
index beb624f..7cd44ee 100644
--- a/drivers/vga.c
+++ b/drivers/vga.c
@@ -1,5 +1,5 @@
 #include "port.h"
-#include "../string.h"
+#include "../lib/string.h"
 
 static char* const video_memory = (char*) 0xb8000;
 
diff --git a/fs/fs.c b/fs/fs.c
index abd1fef..6c7e6b6 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -1,5 +1,5 @@
 #include "fs.h"
-#include "../string.h"
+#include "../lib/string.h"
 #include "../drivers/ata.h"
 
 enum {
diff --git a/kernel.c b/kernel.c
index 436dce6..fbf61b8 100644
--- a/kernel.c
+++ b/kernel.c
@@ -1,4 +1,4 @@
-asm(".asciz \"kernel start\"");
+asm(".asciz \"kernel start\\n\"");
 
 #include "console.h"
 #include "cpu/isr.h"
@@ -9,7 +9,7 @@ asm(".asciz \"kernel start\"");
 #include "drivers/misc.h"
 #include "drivers/uart.h"
 #include "fs/fs.h"
-#include "string.h"
+#include "lib/string.h"
 
 void _start() {
     load_gdt();
@@ -34,6 +34,10 @@ void _start() {
         if (kbd_buf_size > 0 && kbd_buf[kbd_buf_size-1] == '\n') {
             if (!strncmp("halt\n", kbd_buf, kbd_buf_size)) {
                 qemu_shutdown();
+            } else if (!strncmp("run ", kbd_buf, kbd_buf_size)) {
+                kbd_buf[kbd_buf_size-1] = '\0';
+                // const char* cmd = kbd_buf + 4;
+                // run_elf(cmd);
             } else {
                 printk("unknown command, try: halt\n> ");
             }
diff --git a/string.c b/lib/string.c
similarity index 100%
rename from string.c
rename to lib/string.c
diff --git a/string.h b/lib/string.h
similarity index 100%
rename from string.h
rename to lib/string.h