From ec084d3aca4b13caf1211e0205b3e9e472d50006 Mon Sep 17 00:00:00 2001
From: ChUrl <christoph.urlacher@protonmail.com>
Date: Mon, 11 Jul 2022 19:29:42 +0200
Subject: [PATCH] move user stuff to user

---
 c_os/{lib/MyStdLib.cc => user/MyLib.cc} | 2 +-
 c_os/{lib/MyStdLib.h => user/MyLib.h}   | 6 ++----
 c_os/{lib => user}/ScrollbackBuffer.cc  | 2 +-
 c_os/{lib => user}/ScrollbackBuffer.h   | 4 +---
 4 files changed, 5 insertions(+), 9 deletions(-)
 rename c_os/{lib/MyStdLib.cc => user/MyLib.cc} (87%)
 rename c_os/{lib/MyStdLib.h => user/MyLib.h} (81%)
 rename c_os/{lib => user}/ScrollbackBuffer.cc (96%)
 rename c_os/{lib => user}/ScrollbackBuffer.h (95%)

diff --git a/c_os/lib/MyStdLib.cc b/c_os/user/MyLib.cc
similarity index 87%
rename from c_os/lib/MyStdLib.cc
rename to c_os/user/MyLib.cc
index 321ea12..a515502 100755
--- a/c_os/lib/MyStdLib.cc
+++ b/c_os/user/MyLib.cc
@@ -1,4 +1,4 @@
-#include "MyStdLib.h"
+#include "user/MyLib.h"
 
 void mmem::memset(char* destination, char value, unsigned int bytes) {
     for (unsigned int byte = 0; byte < bytes; ++byte) {
diff --git a/c_os/lib/MyStdLib.h b/c_os/user/MyLib.h
similarity index 81%
rename from c_os/lib/MyStdLib.h
rename to c_os/user/MyLib.h
index 01e103a..db1d85d 100755
--- a/c_os/lib/MyStdLib.h
+++ b/c_os/user/MyLib.h
@@ -1,8 +1,6 @@
 #ifndef __MYSTDLIB_INCLUDE_H_
 #define __MYSTDLIB_INCLUDE_H_
 
-// NOTE: I added this file
-
 namespace mmem {
     template<typename T>
     void memcpy(T* destination, T* source, unsigned int count = 1) {
@@ -18,8 +16,8 @@ namespace mmem {
         mmem::memset((char*)destination, '\0', sizeof(T));
     }
 
-    void strcpy(char* destination, char* source);
-    unsigned int strlen(char* string);
+    // void strcpy(char* destination, char* source);
+    // unsigned int strlen(char* string);
 }  // namespace mmem
 
 #endif
diff --git a/c_os/lib/ScrollbackBuffer.cc b/c_os/user/ScrollbackBuffer.cc
similarity index 96%
rename from c_os/lib/ScrollbackBuffer.cc
rename to c_os/user/ScrollbackBuffer.cc
index b7ca874..f83f562 100755
--- a/c_os/lib/ScrollbackBuffer.cc
+++ b/c_os/user/ScrollbackBuffer.cc
@@ -1,4 +1,4 @@
-#include "ScrollbackBuffer.h"
+#include "user/ScrollbackBuffer.h"
 
 // NOTE: I added this file
 
diff --git a/c_os/lib/ScrollbackBuffer.h b/c_os/user/ScrollbackBuffer.h
similarity index 95%
rename from c_os/lib/ScrollbackBuffer.h
rename to c_os/user/ScrollbackBuffer.h
index 6598e22..b3217d3 100755
--- a/c_os/lib/ScrollbackBuffer.h
+++ b/c_os/user/ScrollbackBuffer.h
@@ -2,12 +2,10 @@
 #define __SCROLLBACKBUFFER_INCLUDE_H_
 
 #include "devices/CGA.h"
-#include "lib/MyStdLib.h"
+#include "user/MyLib.h"
 #include <memory>
 #include <stddef.h>
 
-// NOTE: I added this file
-
 class ScrollbackBuffer {
 private:
     std::unique_ptr<CGA::cga_page_t[]> buffer;  // Circular buffer to store lines that left the screen