ld-tool portability fix: MacOS build experience

[lunaix-os.git] / lunaix-os / libs / klibc / string / strcpy.c

diff --git a/lunaix-os/libs/klibc/string/strcpy.c b/lunaix-os/libs/klibc/string/strcpy.c
index 12586064cd6767fe36abb89139dc4eb2f180a45a..04c85c9784db0f4ccbab8e8d6c27c19a8c4bd1b7 100644 (file)
--- a/lunaix-os/libs/klibc/string/strcpy.c
+++ b/lunaix-os/libs/klibc/string/strcpy.c
@@ -1,23 +1,27 @@
 #include <klibc/string.h>
+#include <lunaix/compiler.h>
 
-char*
-strcpy(char* dest, const char* src) {
+char* weak
+strcpy(char* dest, const char* src)
+{
     char c;
     unsigned int i = 0;
-    while ((c = src[i]))
-    {
+    while ((c = src[i])) {
         dest[i] = c;
         i++;
     }
-    dest[i] = '\0';
-    return dest;
+    dest[i++] = '\0';
+    return &dest[i];
 }
 
-char*
-strncpy(char* dest, const char* src, size_t n) {
+char* weak
+strncpy(char* dest, const char* src, unsigned long n)
+{
     char c;
     unsigned int i = 0;
-    while ((c = src[i]) && i < n) dest[i++] = c;
-    while (i < n) dest[i++] = 0;
+    while ((c = src[i]) && i <= n)
+        dest[i++] = c;
+    while (i <= n)
+        dest[i++] = 0;
     return dest;
 }
\ No newline at end of file