2 files changed, 109 insertions, 104 deletions

diff --git a/src/libc/string/basic.c b/src/libc/string/basic.c
new file mode 100644
index 0000000..902779b
--- /dev/null
+++ b/src/libc/string/basic.c
@@ -0,0 +1,105 @@
+/** String functions that don't depend on any external functions. */
+
+#include <string.h>
+
+char *strchr(const char *s, int c) {
+	for (; *s || c == 0; s++) {
+		if (*s == c) return (char *)s;
+	}
+	return NULL;
+}
+
+char *strrchr(const char *s, int c) {
+	for (int i = strlen(s) + 1; i >= 0; i--) {
+		if (s[i] == c) return (char *)s + i;
+	}
+	return NULL;
+}
+
+size_t strspn(const char *s, const char *accept) {
+	size_t l = 0;
+	for (; s[l] && strchr(accept, s[l]); l++);
+	return l;
+}
+
+size_t strcspn(const char *s, const char *reject) {
+	size_t l = 0;
+	for (; s[l] && !strchr(reject, s[l]); l++);
+	return l;
+}
+
+char *strpbrk(const char *s1, const char *s2) {
+	for (; *s1; s1++) {
+		if (strchr(s2, *s1)) return (char*)s1;
+	}
+	return NULL;
+}
+
+char *strtok(char *restrict s, const char *restrict sep) {
+	static char *state;
+	return strtok_r(s, sep, &state);
+}
+
+char *strtok_r(char *restrict s, const char *restrict sep, char **restrict state) {
+	char *end;
+	if (!s) s = *state;
+	s += strspn(s, sep); /* beginning of token */
+	if (!*s) return NULL;
+
+	end = s + strcspn(s, sep);
+	if (*end) {
+		*end = '\0';
+		*state = end + 1;
+	} else {
+		*state = end;
+	}
+	return s;
+}
+
+int strncmp(const char *s1, const char *s2, size_t n) {
+	for (size_t i = 0; i < n; i++) {
+		if (s1[i] < s2[i]) return -1;
+		if (s1[i] > s2[i]) return  1;
+	}
+	return 0;
+}
+
+int strcoll(const char *s1, const char *s2) {
+	return strcmp(s1, s2);
+}
+
+char *strstr(const char *s1, const char *s2) {
+	size_t l1 = strlen(s1), l2 = strlen(s2);
+	for (; l2 <= l1; s1++, l1--) {
+		if (memcmp(s1, s2, l2) == 0) return (char*)s1;
+	}
+	return NULL;
+}
+
+char *strcat(char *restrict dst, const char *restrict src) {
+	return strcpy(dst + strlen(dst), src);
+}
+
+char *strcpy(char *restrict s1, const char *restrict s2) {
+	char *ret = s1;
+	while (*s2) *s1++ = *s2++;
+	*s1 = *s2;
+	return ret;
+}
+
+char *strncpy(char *restrict dst, const char *restrict src, size_t n) {
+	for (size_t i = 0; i < n; i++) {
+		dst[i] = src[i];
+		if (dst[i] == '\0') return dst + i; // TODO fill with null bytes
+	}
+	return dst;
+}
+
+size_t strnlen(const char *s, size_t len) {
+	for (size_t i = 0; i < len; i++) {
+		if (!s[i]) {
+			return i;
+		}
+	}
+	return len;
+}
diff --git a/src/libc/string/string.c b/src/libc/string/string.c
index 748b0b5..e93b0a6 100644
--- a/src/libc/string/string.c
+++ b/src/libc/string/string.c
@@ -1,3 +1,5 @@
+/** String functions that don't fit into any of the other .c files */
+
 #include <bits/panic.h>
 #include <ctype.h>
 #include <errno.h>
@@ -5,107 +7,14 @@
 #include <string.h>
 #include <strings.h>
 
-char *strchr(const char *s, int c) {
-	for (; *s || c == 0; s++) {
-		if (*s == c) return (char *)s;
-	}
-	return NULL;
-}
-
-char *strrchr(const char *s, int c) {
-	for (int i = strlen(s) + 1; i >= 0; i--) {
-		if (s[i] == c) return (char *)s + i;
-	}
-	return NULL;
-}
-
-size_t strspn(const char *s, const char *accept) {
-	size_t l = 0;
-	for (; s[l] && strchr(accept, s[l]); l++);
-	return l;
-}
-
-size_t strcspn(const char *s, const char *reject) {
-	size_t l = 0;
-	for (; s[l] && !strchr(reject, s[l]); l++);
-	return l;
-}
-
-char *strpbrk(const char *s1, const char *s2) {
-	for (; *s1; s1++) {
-		if (strchr(s2, *s1)) return (char*)s1;
-	}
-	return NULL;
-}
-
-char *strtok(char *restrict s, const char *restrict sep) {
-	static char *state;
-	return strtok_r(s, sep, &state);
-}
-
-char *strtok_r(char *restrict s, const char *restrict sep, char **restrict state) {
-	char *end;
-	if (!s) s = *state;
-	s += strspn(s, sep); /* beginning of token */
-	if (!*s) return NULL;
-
-	end = s + strcspn(s, sep);
-	if (*end) {
-		*end = '\0';
-		*state = end + 1;
-	} else {
-		*state = end;
-	}
-	return s;
-}
-
-int strncmp(const char *s1, const char *s2, size_t n) {
-	for (size_t i = 0; i < n; i++) {
-		if (s1[i] < s2[i]) return -1;
-		if (s1[i] > s2[i]) return  1;
-	}
-	return 0;
-}
-
-int strcoll(const char *s1, const char *s2) {
-	return strcmp(s1, s2);
-}
-
-// TODO implement strstr using Boyer-Moore
-char *strstr(const char *s1, const char *s2) {
-	size_t l1 = strlen(s1), l2 = strlen(s2);
-	for (; l2 <= l1; s1++, l1--) {
-		if (memcmp(s1, s2, l2) == 0) return (char*)s1;
-	}
-	return NULL;
-}
-
-char *strcat(char *restrict dst, const char *restrict src) {
-	return strcpy(dst + strlen(dst), src);
-}
-
-char *strcpy(char *restrict s1, const char *restrict s2) {
-	char *ret = s1;
-	while (*s2) *s1++ = *s2++;
-	*s1 = *s2;
-	return ret;
-}
-
-char *strncpy(char *restrict dst, const char *restrict src, size_t n) {
-	for (size_t i = 0; i < n; i++) {
-		dst[i] = src[i];
-		if (dst[i] == '\0') return dst + i; // TODO fill with null bytes
-	}
-	return dst;
-}
-
 char *strncat(char *restrict dst, const char *restrict src, size_t n) {
 	(void)dst; (void)src; (void)n;
 	__libc_panic("unimplemented");
 }
 
 char *stpncpy(char *restrict dst, const char *restrict src, size_t n) {
-	return stpncpy(dst, src, n) + n;
+	(void)dst; (void)src; (void)n;
+	__libc_panic("unimplemented");
 }
 
 char *strdup(const char *s) {
@@ -115,15 +24,6 @@ char *strdup(const char *s) {
 	return buf;
 }
 
-size_t strnlen(const char *s, size_t len) {
-	for (size_t i = 0; i < len; i++) {
-		if (!s[i]) {
-			return i;
-		}
-	}
-	return len;
-}
-
 char *strsignal(int sig) {
 	static char buf[32];
 	snprintf(buf, sizeof(buf), "signal %d", sig);