From 61da9ad161c7d794e8d8485dec73b2efb8fa52f9 Mon Sep 17 00:00:00 2001
From: timerix <timerix11@gmail.com>
Date: Mon, 5 Jun 2023 13:55:00 +0600
Subject: [PATCH] memcpy

---
 src/Filesystem/path.c |  4 ++--
 src/base/cptr.c       | 12 ++----------
 src/base/cptr.h       |  2 --
 src/base/std.h        |  4 ++++
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/Filesystem/path.c b/src/Filesystem/path.c
index cc5cb6e..dbccdda 100644
--- a/src/Filesystem/path.c
+++ b/src/Filesystem/path.c
@@ -25,12 +25,12 @@ char* __path_concat(u32 n, ...){
     // copying content of all strings to rezult
     u16 k=0;
     for(; k<n-1; k++){
-        memcopy(parts[k], totality, lengths[k]);
+        memcpy(totality, parts[k], lengths[k]);
         totality+=lengths[k];
         *totality=path_sep;
         totality++;
     }
-    memcopy(parts[k], totality, lengths[k]);
+    memcpy(totality, parts[k], lengths[k]);
 
     free(parts);
     free(lengths);
diff --git a/src/base/cptr.c b/src/base/cptr.c
index 07eee43..4f916ae 100644
--- a/src/base/cptr.c
+++ b/src/base/cptr.c
@@ -14,8 +14,7 @@ u32 cptr_length(const char* str){
 char* cptr_copy(const char* src){
     u32 len=cptr_length(src)+1;
     char* dst=malloc(len);
-    while(len--!=0)
-        dst[len]=src[len];
+    memcpy(dst, src, len);
     return dst;
 }
 
@@ -131,13 +130,6 @@ i32 cptr_seekCharReverse(const char* src, char fragment, u32 startIndex, u32 see
     return -1;
 }
 
-void memcopy(void* from, void* to, u32 size){
-    if(from==NULL || to==NULL)
-        throw(ERR_NULLPTR);
-    for(u32 i=0; i<size; i++)
-        ((char*)to)[i]=((char*)from)[i];
-}
-
 char* __cptr_concat(u32 n, ...){
     char** strs=(char**)malloc(n*sizeof(char*));
     u32* lengths=malloc(n*sizeof(u32));
@@ -162,7 +154,7 @@ char* __cptr_concat(u32 n, ...){
     
     // copying content of all strings to rezult
     for(u16 k=0; k<n; k++){
-        memcopy(strs[k], totality, lengths[k]);
+        memcpy(totality, strs[k], lengths[k]);
         totality+=lengths[k];
     }
     
diff --git a/src/base/cptr.h b/src/base/cptr.h
index 509577c..65d6288 100644
--- a/src/base/cptr.h
+++ b/src/base/cptr.h
@@ -66,8 +66,6 @@ static inline bool cptr_contains(const char* src, const char* fragment){
     return cptr_seek(src, fragment, 0, -1) +1;
 }
 
-void memcopy(void* from, void* to, u32 size);
-
 char* __cptr_concat(u32 n, ...);
 #define cptr_concat(STR...) __cptr_concat(count_args(STR), STR)
 
diff --git a/src/base/std.h b/src/base/std.h
index 816d328..e81e41e 100644
--- a/src/base/std.h
+++ b/src/base/std.h
@@ -38,6 +38,10 @@ typedef u8 bool;
 #define false 0
 #endif
 
+#ifndef memcpy
+extern void* memcpy(void *dest, const void * src, size_t n);
+#endif
+
 #define dbg(N) kprintf("\e[95m%d\n",N)
 
 #define nameof(V) #V