2 files changed, 109 insertions, 3 deletions

diff --git a/libc/include/malloc.h b/libc/include/malloc.h
index ee877a1..715c90b 100644
--- a/libc/include/malloc.h
+++ b/libc/include/malloc.h
@@ -3,7 +3,7 @@
 
 #include <reent.h>
 #include <stddef.h>
-#include <string.h>
+#include <stdint.h>
 
 typedef void * (*malloc_t)(size_t size);
 typedef void (*free_t)(void * ptr);
@@ -18,8 +18,10 @@ extern free_t free;
 extern realloc_t realloc;
 
 static inline void * calloc(size_t nmemb, size_t size) {
-    void * r = malloc(nmemb * size);
-    memset(r, 0, nmemb * size);
+    uint8_t * r = malloc(nmemb * size);
+    size_t i;
+    for (i = 0; i < size; i++)
+        r[i] = 0;
     return r;
 }
 
diff --git a/libc/include/string.h b/libc/include/string.h
index cd58681..5505bed 100644
--- a/libc/include/string.h
+++ b/libc/include/string.h
@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <malloc.h>
 
 static inline void * memcpy(void * _s1, const void * _s2, size_t n) {
     uint8_t * s1 = (uint8_t *) _s1;
@@ -15,6 +16,24 @@ static inline void * memcpy(void * _s1, const void * _s2, size_t n) {
     return _s1;
 }
 
+static inline void * memmove(void * _s1, const void * _s2, size_t n) {
+    uint8_t * s1 = (uint8_t *) _s1;
+    const uint8_t * s2 = (uint8_t *) _s2;
+    size_t i;
+    
+    if (s1 < s2) {
+        for (i = 0; i < n; i++)
+            *s1++ = *s2++;
+    } else if (s1 > s2) {
+        s1 += n;
+        s2 += n;
+        for (i = 0; i < n; i++)
+            *--s1 = *--s2;
+    }
+    
+    return _s1;
+}
+
 static inline int memcmp(const void * _s1, const void * _s2, size_t n) {
     uint8_t * s1 = (uint8_t *) _s1;
     const uint8_t * s2 = (uint8_t *) _s2;
@@ -41,6 +60,17 @@ static inline void * memset(void * _s, int c, size_t n) {
     return _s;
 }
 
+static inline const void * memchr(const void * _s, int c, size_t n) {
+    const uint8_t * s = (uint8_t *) _s;
+    size_t i;
+    
+    for (i = 0; i < n; i++, s++)
+        if (*s == c)
+            return s;
+    
+    return NULL;
+}
+
 static inline char * strcat(char * s1, const char * s2) {
     char * r = s1;
     
@@ -84,9 +114,22 @@ static inline const char * strchr(const char * s, char c) {
             return s;
         s++;
     }
+    
     return NULL;
 }
 
+static inline const char * strrchr(const char * s, char c) {
+    const char * r = NULL;
+    
+    while (*s) {
+        if (*s == c)
+            r = s;
+        s++;
+    }
+    
+    return r;
+}
+
 static inline size_t strlen(const char * s) {
     size_t r = 0;
     
@@ -96,4 +139,65 @@ static inline size_t strlen(const char * s) {
     return r;
 }
 
+static inline char * strncat(char * s1, const char * s2, size_t n) {
+    char * r = s1;
+    
+    while (*s1)
+        s1++;
+    strncpy(s1, s2, n);
+    
+    return r;
+}
+
+static inline int strcmp(const char * s1, const char * s2) {
+    while (*s1 && *s2) {
+        if (!*s1) {
+            return -1;
+        } else if (!*s2) {
+            return 1;
+        } else if (*s1 < *s2) {
+            return -1;
+        } else if (*s1 > *s2) {
+            return 1;
+        }
+        s1++;
+        s2++;
+    }
+    
+    return 0;
+}
+
+static inline int strncmp(const char * s1, const char * s2, size_t n) {
+    while (*s1 && *s2 && n) {
+        if (!*s1) {
+            return -1;
+        } else if (!*s2) {
+            return 1;
+        } else if (*s1 < *s2) {
+            return -1;
+        } else if (*s1 > *s2) {
+            return 1;
+        }
+        s1++;
+        s2++;
+        n--;
+    }
+    
+    return 0;
+}
+
+static inline char * strdup(const char * s) {
+    return strcpy((char *) malloc(strlen(s) + 1), s);
+}
+
+static inline const char * strstr(const char * s1, const char * s2) {
+    size_t l = strlen(s2);
+    
+    while (*s1) {
+        if (!strncmp(s1, s2, l))
+            return s1;
+        s1++;
+    }
+}
+
 #endif