X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2Fstring.c;h=0757c24ad3ee46432d3cc7f1232017dfe06cb968;hb=4e407e69bd660e9a32644281733192193ee6e8c8;hp=3cadee900fc586215180203f2fe2a91eed8481bc;hpb=8dcc3e209d0d728565a18c8dca2b0ba220b74a6f;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/string.c b/Usermode/Libraries/libc.so_src/string.c
index 3cadee90..0757c24a 100644
--- a/Usermode/Libraries/libc.so_src/string.c
+++ b/Usermode/Libraries/libc.so_src/string.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include "lib.h"
+#include <string.h>
 
 /**
  * \fn EXPORT int strcmp(const char *s1, const char *s2)
@@ -100,6 +101,18 @@ EXPORT char *strcat(char *dst, const char *src)
 	return dst;
 }
 
+EXPORT char *strncat(char *dst, const char *src, size_t n)
+{
+	char	*to = dst;
+	// Find the end
+	while(*to)	to++;
+	// Copy
+	while(*src && n--)	*to++ = *src++;
+	// End string
+	*to = '\0';
+	return dst;
+}
+
 /**
  * \brief Get the length of a string
  */
@@ -188,13 +201,13 @@ EXPORT char *strrchr(const char *str, int character)
  * \fn EXPORT char *strstr(char *str1, const char *str2)
  * \brief Search a \a str1 for the first occurance of \a str2
  */
-EXPORT char *strstr(char *str1, const char *str2)
+EXPORT char *strstr(const char *str1, const char *str2)
 {
 	const char	*test = str2;
 	
 	for(;*str1;str1++)
 	{
-		if(*test == '\0')	return str1;
+		if(*test == '\0')	return (char*)str1;
 		if(*str1 == *test)	test++;
 		else	test = str2;
 	}
@@ -270,14 +283,23 @@ EXPORT void *memcpy(void *__dest, const void *__src, size_t count)
  */
 EXPORT void *memmove(void *dest, const void *src, size_t count)
 {
-	char *sp = (char *)src;
+	const char *sp = (const char *)src;
 	char *dp = (char *)dest;
 	// Check if the areas overlap
-	if( (intptr_t)src < (intptr_t)dest && (intptr_t)dest < (intptr_t)src+count )
-		for(;count--;)
-			dp[count] = sp[count];
-	else
+	if( sp >= dp+count )
+		memcpy(dest, src, count);
+	else if( dp >= sp+count )
 		memcpy(dest, src, count);
+	else {
+		if( sp < dp ) {
+			while(count--)
+				dp[count] = sp[count];
+		}
+		else {
+			while(count--)
+				*dp++ = *sp++;
+		}
+	}
 	return dest;
 }
 
@@ -346,3 +368,48 @@ EXPORT size_t strspn(const char *haystack, const char *accept)
 	}
 	return ret;
 }
+
+EXPORT char *strpbrk(const char *haystack, const char *accept)
+{
+	while( *haystack )
+	{
+		for( int i = 0; accept[i]; i ++ )
+		{
+			if( accept[i] == *haystack )
+				return (char*)haystack;
+		}
+	}
+	return NULL;
+}
+
+char *strtok(char *str, const char *delim)
+{
+	static char *__saveptr;
+	return strtok_r(str, delim, &__saveptr);
+}
+char *strtok_r(char *str, const char *delim, char **saveptr)
+{
+	char *pos = (str ? str : *saveptr);
+	
+	while( strchr(delim, *pos) )
+		pos ++;
+
+	if( *pos == '\0' )
+		return NULL;
+
+	char *ret = pos;
+	while( !strchr(delim, *pos) )
+		pos ++;
+	
+	// Cap the returned string
+	// - If we're at the end of the original string, don't shift pos
+	if( *pos != '\0' ) {
+		*pos = '\0';
+		pos ++;
+	}
+	
+	*saveptr = pos;
+	
+	return ret;
+}
+