* AcessOS Basic C Library
* string.c
*/
-#include <acess/sys.h>
+
//#include <acess/sys.h>
#include <stdlib.h>
#include <stdio.h>
+#include <ctype.h>
#include "lib.h"
+#include <string.h>
/**
* \fn EXPORT int strcmp(const char *s1, const char *s2)
* \brief Compare two strings
*/
-EXPORT int strcmp(const char *s1, const char *s2)
+EXPORT int strcmp(const char *_s1, const char *_s2)
{
- while(*s1 == *s2 && *s1 != '\0' && *s2 != '\0') {
- s1++; s2++;
- }
- return (int)*s1 - (int)*s2;
+ return strncmp(_s1, _s2, SIZE_MAX);
}
/**
- * \fn EXPORT int strncmp(const char *s1, const char *s2)
- * \brief Compare two strings
+ * \fn EXPORT int strncmp(const char *s1, const char *s2, size_t n)
+ * \brief Compare two strings, stopping after n characters
*/
-EXPORT int strncmp(const char *s1, const char *s2, size_t n)
+EXPORT int strncmp(const char *_s1, const char *_s2, size_t n)
{
- if( n == 0 ) return 0;
- while(n -- && *s1 == *s2 && *s1 != '\0' && *s2 != '\0') {
+ const unsigned char* s1 = (const unsigned char*)_s1;
+ const unsigned char* s2 = (const unsigned char*)_s2;
+ while(n && *s1 && *s1 == *s2)
+ {
s1++; s2++;
+ n --;
}
- return (int)*s1 - (int)*s2;
+ if( n == 0 )
+ return 0;
+ else
+ return (int)*s1 - (int)*s2;
+}
+
+EXPORT int strcasecmp(const char *_s1, const char *_s2)
+{
+ return strncasecmp(_s1, _s2, SIZE_MAX);
+}
+
+EXPORT int strncasecmp(const char *_s1, const char *_s2, size_t n)
+{
+ const unsigned char* s1 = (const unsigned char*)_s1;
+ const unsigned char* s2 = (const unsigned char*)_s2;
+ while( n-- && *s1 && *s2 )
+ {
+ if( *s1 != *s2 )
+ {
+ int rv;
+ rv = toupper(*s1) - toupper(*s2);
+ if(rv != 0)
+ return rv;
+ rv = tolower(*s1) - tolower(*s2);
+ if(rv != 0)
+ return rv;
+ }
+ s1 ++;
+ s2 ++;
+ }
+ return 0;
}
/**
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;
+}
+
/**
- * \fn EXPORT int strlen(const char *str)
* \brief Get the length of a string
*/
-EXPORT int strlen(const char *str)
+EXPORT size_t strlen(const char *str)
{
- int retval;
- for(retval = 0; *str != '\0'; str++)
- retval++;
+ size_t retval;
+ for(retval = 0; *str != '\0'; str++, retval++);
return retval;
}
+/**
+ * \brief Get the length of a string, with a maximum of \a maxlen
+ *
+ * Gets the length of a string (excluding the terminating \0 byte)
+ */
+EXPORT size_t strnlen(const char *str, size_t maxlen)
+{
+ size_t len;
+ for( len = 0; maxlen -- && *str; str ++, len ++ )
+ ;
+ return len;
+}
+
/**
* \fn EXPORT char *strdup(const char *str)
* \brief Duplicate a string using heap memory
* \fn EXPORT char *strchr(char *str, int character)
* \brief Locate a character in a string
*/
-EXPORT char *strchr(char *str, int character)
+EXPORT char *strchr(const char *_str, int character)
{
- while(*str)
+ const unsigned char* str = (const unsigned char*)_str;
+ for(;*str;str++)
{
- if(*str == character) return str;
+ if( *str == character )
+ return (char*)str;
}
return NULL;
}
* \fn EXPORT char *strrchr(char *str, int character)
* \brief Locate the last occurance of a character in a string
*/
-EXPORT char *strrchr(char *str, int character)
+EXPORT char *strrchr(const char *_str, int character)
{
- int i;
- i = strlen(str)-1;
- while(i--)
+ const unsigned char* str = (const unsigned char*)_str;
+ for( int i = strlen(_str); i--; )
{
- if(str[i] == character) return &str[i];
+ if(str[i] == character)
+ return (void*)&str[i];
}
return NULL;
}
* \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;
- while(*str1)
+ for(;*str1;str1++)
{
- if(*test == '\0') return str1;
+ if(*test == '\0') return (char*)str1;
if(*str1 == *test) test++;
else test = str2;
- str1 ++;
}
return NULL;
}
* \fn EXPORT void *memcpy(void *dest, const void *src, size_t count)
* \brief Copy one memory area to another
*/
-EXPORT void *memcpy(void *dest, const void *src, size_t count)
+EXPORT void *memcpy(void *__dest, const void *__src, size_t count)
{
- char *sp = (char *)src;
- char *dp = (char *)dest;
- for(;count--;) *dp++ = *sp++;
- return dest;
+ const int wordmask = sizeof(void*)-1;
+ uintptr_t src = (uintptr_t)__src;
+ uintptr_t dst = (uintptr_t)__dest;
+
+ if( count < sizeof(void*)*2 || (dst & wordmask) != (src & wordmask) )
+ {
+ char *dp = __dest;
+ const char *sp = __src;
+ while(count--) *dp++ = *sp ++;
+ }
+ // TODO: Bulk aligned copies
+ #if 0
+ else if(count > 128 && (dst & 15) == (src & 15) )
+ {
+ // SSE/bulk copy
+ for( ; dst & 15; count -- )
+ *(char*)dst++ = *(char*)src++;
+ memcpy_16byte(dst, src, count / 16);
+ dst += count & ~15;
+ src += count & ~15;
+ count &= 15;
+ while(count --)
+ *(char*)dst++ = *(char*)src++;
+ }
+ #endif
+ else
+ {
+ void **dp, **sp;
+ for( ; count && (dst & wordmask) != 0; count -- )
+ *(char*)dst++ = *(char*)src++;
+
+ dp = (void*)dst; sp = (void*)src;
+ while( count >= sizeof(void*) )
+ {
+ *dp++ = *sp++;
+ count -= sizeof(void*);
+ }
+ dst = (uintptr_t)dp; src = (uintptr_t)sp;
+ for( ; count; count -- )
+ *(char*)dst++ = *(char*)src++;
+ }
+
+ return __dest;
}
+// TODO: memccpy (POSIX defined)
+
/**
* \fn EXPORT void *memmove(void *dest, const void *src, size_t count)
* \brief Copy data in memory, avoiding overlap problems
*/
EXPORT void *memmove(void *dest, const void *src, size_t count)
{
- char *sp = (char *)src;
- char *dp = (char *)dest;
- // Check if corruption will happen
- if( (unsigned int)dest > (unsigned int)src && (unsigned int)dest < (unsigned int)src+count )
- for(;count--;) dp[count] = sp[count];
- else
- for(;count--;) *dp++ = *sp++;
- return dest;
+ const char *sp = (const char *)src;
+ char *dp = (char *)dest;
+ // Check if the areas overlap
+ 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;
}
/**
*/
EXPORT int memcmp(const void *mem1, const void *mem2, size_t count)
{
+ const unsigned char *p1 = mem1, *p2 = mem2;
while(count--)
{
- if( *(unsigned char*)mem1 != *(unsigned char*)mem2 )
- return *(unsigned char*)mem1 - *(unsigned char*)mem2;
- mem1 ++;
- mem2 ++;
+ if( *p1 != *p2 )
+ return (int)*p1 - (int)*p2;
+ p1 ++;
+ p2 ++;
}
return 0;
}
* \param value Value to find
* \param num Size of memory area to check
*/
-EXPORT void *memchr(void *ptr, int value, size_t num)
+EXPORT void *memchr(const void *ptr, int value, size_t num)
{
+ const unsigned char* buf = ptr;
while(num--)
{
- if( *(unsigned char*)ptr == (unsigned char)value )
- return ptr;
- ptr ++;
+ if( *buf == (unsigned char)value )
+ return (void*)buf;
+ buf ++;
+ }
+ return NULL;
+}
+
+EXPORT size_t strcspn(const char *haystack, const char *reject)
+{
+ size_t ret = 0;
+ while( *haystack )
+ {
+ for( int i = 0; reject[i]; i ++ )
+ {
+ if( reject[i] == *haystack )
+ return ret;
+ }
+ ret ++;
+ }
+ return ret;
+}
+
+EXPORT size_t strspn(const char *haystack, const char *accept)
+{
+ size_t ret = 0;
+ while( *haystack )
+ {
+ for( int i = 0; accept[i]; i ++ )
+ {
+ if( accept[i] != *haystack )
+ return ret;
+ }
+ ret ++;
+ }
+ 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;
+ }
+ 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;
+}
+
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au