X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_string.c;h=effaf32a6580d5f74201c35310a0ac08f514597c;hp=efe5a7df29394f4f81109b00e4dc446ce242a75b;hb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;hpb=0dc6c1ec345d5c48e348b7e6532e5dcec00fa2ff diff --git a/palacios/src/palacios/vmm_string.c b/palacios/src/palacios/vmm_string.c index efe5a7d..effaf32 100644 --- a/palacios/src/palacios/vmm_string.c +++ b/palacios/src/palacios/vmm_string.c @@ -36,37 +36,17 @@ */ - -#define NEED_MEMSET 0 -#define NEED_MEMCPY 0 -#define NEED_MEMCMP 0 -#define NEED_STRLEN 0 -#define NEED_STRNLEN 0 -#define NEED_STRCMP 0 -#define NEED_STRNCMP 0 -#define NEED_STRCAT 0 -#define NEED_STRNCAT 0 -#define NEED_STRCPY 0 -#define NEED_STRNCPY 0 -#define NEED_STRDUP 0 -#define NEED_ATOI 0 -#define NEED_STRCHR 0 -#define NEED_STRRCHR 0 -#define NEED_STRPBRK 0 - - - +#include #include #include -#if NEED_MEMSET -void* memset(void* s, int c, size_t n) -{ - unsigned char* p = (unsigned char*) s; +#ifdef CONFIG_BUILT_IN_MEMSET +void * memset(void * s, int c, size_t n) { + uchar_t * p = (uchar_t *) s; while (n > 0) { - *p++ = (unsigned char) c; + *p++ = (uchar_t) c; --n; } @@ -74,11 +54,10 @@ void* memset(void* s, int c, size_t n) } #endif -#if NEED_MEMCPY -void* memcpy(void *dst, const void* src, size_t n) -{ - unsigned char* d = (unsigned char*) dst; - const unsigned char* s = (const unsigned char*) src; +#ifdef CONFIG_BUILT_IN_MEMCPY +void * memcpy(void * dst, const void * src, size_t n) { + uchar_t * d = (uchar_t *) dst; + const uchar_t * s = (const uchar_t *)src; while (n > 0) { *d++ = *s++; @@ -89,16 +68,31 @@ void* memcpy(void *dst, const void* src, size_t n) } #endif +#ifdef CONFIG_BUILT_IN_MEMMOVE +void * memmove(void * dst, const void * src, size_t n) { + uint8_t * tmp = (uint8_t *)V3_Malloc(n); + + memcpy(tmp, src, n); + memcpy(dst, tmp, n); + + V3_Free(tmp); + return dst; +} +#endif + -#if NEED_CMP -int memcmp(const void *s1_, const void *s2_, size_t n) -{ - const signed char *s1 = s1_, *s2 = s2_; +#ifdef CONFIG_BUILT_IN_MEMCMP +int memcmp(const void * s1_, const void * s2_, size_t n) { + const char * s1 = s1_; + const char * s2 = s2_; while (n > 0) { - int cmp = *s1 - *s2; - if (cmp != 0) + int cmp = (*s1 - *s2); + + if (cmp != 0) { return cmp; + } + ++s1; ++s2; } @@ -108,19 +102,21 @@ int memcmp(const void *s1_, const void *s2_, size_t n) #endif -#if NEED_STRLEN -size_t strlen(const char* s) -{ +#ifdef CONFIG_BUILT_IN_STRLEN +size_t strlen(const char * s) { size_t len = 0; - while (*s++ != '\0') + + while (*s++ != '\0') { ++len; + } + return len; } #endif -#if NEED_STRNLEN +#ifdef CONFIG_BUILT_IN_STRNLEN /* * This it a GNU extension. * It is like strlen(), but it will check at most maxlen @@ -129,38 +125,61 @@ size_t strlen(const char* s) * This is very useful for checking the length of untrusted * strings (e.g., from user space). */ -size_t strnlen(const char *s, size_t maxlen) -{ +size_t strnlen(const char * s, size_t maxlen) { size_t len = 0; - while (len < maxlen && *s++ != '\0') + + while ((len < maxlen) && (*s++ != '\0')) { ++len; + } + return len; } #endif -#if NEED_STRCMP -int strcmp(const char* s1, const char* s2) -{ +#ifdef CONFIG_BUILT_IN_STRCMP +int strcmp(const char * s1, const char * s2) { while (1) { - int cmp = *s1 - *s2; - if (cmp != 0 || *s1 == '\0' || *s2 == '\0') + int cmp = (*s1 - *s2); + + if ((cmp != 0) || (*s1 == '\0') || (*s2 == '\0')) { return cmp; + } + ++s1; ++s2; } } #endif +#ifdef CONFIG_BUILT_IN_STRCASECMP +int strcasecmp(const char * s1, const char * s2) { + while (1) { + int cmp = (tolower(*s1) - tolower(*s2)); -#if NEED_STRNCMP -int strncmp(const char* s1, const char* s2, size_t limit) -{ + if ((cmp != 0) || (*s1 == '\0') || (*s2 == '\0')) { + return cmp; + } + + ++s1; + ++s2; + } +} + +#endif + + +#ifdef CONFIG_BUILT_IN_STRNCMP +int strncmp(const char * s1, const char * s2, size_t limit) { size_t i = 0; + while (i < limit) { - int cmp = *s1 - *s2; - if (cmp != 0 || *s1 == '\0' || *s2 == '\0') + int cmp = (*s1 - *s2); + + if ((cmp != 0) || (*s1 == '\0') || (*s2 == '\0')) { return cmp; + } + ++s1; ++s2; ++i; @@ -171,15 +190,34 @@ int strncmp(const char* s1, const char* s2, size_t limit) } #endif +#ifdef CONFIG_BUILT_IN_STRNCASECMP +int strncasecmp(const char * s1, const char * s2, size_t limit) { + size_t i = 0; -#if NEED_STRCAT -char *strcat(char *s1, const char *s2) -{ - char *t1; + while (i < limit) { + int cmp = (tolower(*s1) - tolower(*s2)); + + if ((cmp != 0) || (*s1 == '\0') || (*s2 == '\0')) { + return cmp; + } + + ++s1; + ++s2; + ++i; + } + + return 0; +} +#endif + + +#ifdef CONFIG_BUILT_IN_STRCAT +char * strcat(char * s1, const char * s2) { + char * t1 = s1; + + while (*s1) { s1++; } + while (*s2) { *s1++ = *s2++; } - t1 = s1; - while (*s1) s1++; - while(*s2) *s1++ = *s2++; *s1 = '\0'; return t1; @@ -187,15 +225,19 @@ char *strcat(char *s1, const char *s2) #endif -#if NEED_STRNCAT -char *strncat(char *s1, const char *s2, size_t limit) -{ +#ifdef CONFIG_BUILT_IN_STRNCAT +char * strncat(char * s1, const char * s2, size_t limit) { size_t i = 0; - char *t1; + char * t1; + t1 = s1; - while (*s1) s1++; + + while (*s1) { s1++; } + while (i < limit) { - if(*s2 == '\0') break; + if (*s2 == '\0') { + break; + } *s1++ = *s2++; } *s1 = '\0'; @@ -205,8 +247,8 @@ char *strncat(char *s1, const char *s2, size_t limit) -#if NEED_STRCPY -char *strcpy(char *dest, const char *src) +#ifdef CONFIG_BUILT_IN_STRCPY +char * strcpy(char * dest, const char * src) { char *ret = dest; @@ -220,15 +262,15 @@ char *strcpy(char *dest, const char *src) #endif -#if NEED_STRNCPY -char *strncpy(char *dest, const char *src, size_t limit) -{ - char *ret = dest; +#ifdef CONFIG_BUILT_IN_STRNCPY +char * strncpy(char * dest, const char * src, size_t limit) { + char * ret = dest; - while (*src != '\0' && limit > 0) { + while ((*src != '\0') && (limit > 0)) { *dest++ = *src++; --limit; } + if (limit > 0) *dest = '\0'; @@ -238,9 +280,8 @@ char *strncpy(char *dest, const char *src, size_t limit) -#if NEED_STRDUP -char *strdup(const char *s1) -{ +#ifdef CONFIG_BUILT_IN_STRDUP +char * strdup(const char * s1) { char *ret; ret = V3_Malloc(strlen(s1) + 1); @@ -253,14 +294,13 @@ char *strdup(const char *s1) -#if NEED_ATOI -int atoi(const char *buf) -{ +#ifdef CONFIG_BUILT_IN_ATOI +int atoi(const char * buf) { int ret = 0; - while (*buf >= '0' && *buf <= '9') { + while ((*buf >= '0') && (*buf <= '9')) { ret *= 10; - ret += *buf - '0'; + ret += (*buf - '0'); buf++; } @@ -269,12 +309,81 @@ int atoi(const char *buf) #endif -#if NEED_STRCHR -char *strchr(const char *s, int c) -{ +int strtoi(const char * nptr, char ** endptr) { + int ret = 0; + char * buf = (char *)nptr; + + while ((*buf >= '0') && (*buf <= '9')) { + ret *= 10; + ret += (*buf - '0'); + + buf++; + + if (endptr) { + *endptr = buf; + } + } + + return ret; +} + +uint64_t atox(const char * buf) { + uint64_t ret = 0; + + if (*(buf + 1) == 'x') { + buf += 2; + } + + while (isxdigit(*buf)) { + ret <<= 4; + + if (isdigit(*buf)) { + ret += (*buf - '0'); + } else { + ret += tolower(*buf) - 'a' + 10; + } + + buf++; + } + + return ret; +} + +uint64_t strtox(const char * nptr, char ** endptr) { + uint64_t ret = 0; + char * buf = (char *)nptr; + + if (*(buf + 1) == 'x') { + buf += 2; + } + + while (isxdigit(*buf)) { + ret <<= 4; + + if (isdigit(*buf)) { + ret += (*buf - '0'); + } else { + ret += tolower(*buf) - 'a' + 10; + } + + buf++; + + if (endptr) { + *endptr = buf; + } + } + + return ret; + +} + + + +#ifdef CONFIG_BUILT_IN_STRCHR +char * strchr(const char * s, int c) { while (*s != '\0') { if (*s == c) - return (char *) s; + return (char *)s; ++s; } return 0; @@ -282,31 +391,32 @@ char *strchr(const char *s, int c) #endif -#if NEED_STRRCHR -char *strrchr(const char *s, int c) -{ +#ifdef CONFIG_BUILT_IN_STRRCHR +char * strrchr(const char * s, int c) { size_t len = strlen(s); - const char *p = s + len; + const char * p = s + len; while (p > s) { --p; - if (*p == c) - return (char*) p; + + if (*p == c) { + return (char *)p; + } } return 0; } #endif -#if NEED_STRPBRK -char *strpbrk(const char *s, const char *accept) -{ +#ifdef CONFIG_BUILT_IN_STRPBRK +char * strpbrk(const char * s, const char * accept) { size_t setLen = strlen(accept); while (*s != '\0') { size_t i; for (i = 0; i < setLen; ++i) { - if (*s == accept[i]) - return (char *) s; + if (*s == accept[i]) { + return (char *)s; + } } ++s; } @@ -315,3 +425,87 @@ char *strpbrk(const char *s, const char *accept) } #endif +#ifdef CONFIG_BUILT_IN_STRSPN +size_t strspn(const char * s, const char * accept) { + int match = 1; + int cnt = 0; + int i = 0; + int accept_len = strlen(accept); + + while (match) { + match = 0; + + for (i = 0; i < accept_len; i++) { + if (s[cnt] == accept[i]) { + match = 1; + cnt++; + break; + } + } + } + + return cnt; +} +#endif + + +#ifdef CONFIG_BUILT_IN_STRCSPN +size_t strcspn(const char * s, const char * reject) { + int match = 0; + int cnt = 0; + int i = 0; + int reject_len = strlen(reject); + + while (!match) { + for (i = 0; i < reject_len; i++) { + if (s[cnt] == reject[i]) { + match = 1; + cnt++; + break; + } + } + } + + return cnt; +} +#endif + + +#ifdef CONFIG_BUILT_IN_STRSTR +char *strstr(const char *haystack, const char *needle) +{ + int l1, l2; + + l2 = strlen(s2); + if (!l2) + return (char *)s1; + l1 = strlen(s1); + while (l1 >= l2) { + l1--; + if (!memcmp(s1, s2, l2)) + return (char *)s1; + s1++; + } + return NULL; +} +#endif + + +void str_tolower(char * s) { + while (isalpha(*s)) { + if (!islower(*s)) { + *s = tolower(*s); + } + s++; + } +} + + +void str_toupper(char * s) { + while (isalpha(*s)) { + if (!isupper(*s)) { + *s = toupper(*s); + } + s++; + } +}