Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios...

[palacios.git] / palacios / include / palacios / vmm_string.h

diff --git a/palacios/include/palacios/vmm_string.h b/palacios/include/palacios/vmm_string.h
index c5cf8b8..2e57bf9 100644 (file)
--- a/palacios/include/palacios/vmm_string.h
+++ b/palacios/include/palacios/vmm_string.h
@@ -34,7 +34,8 @@
 
 #ifdef __V3VEE__
 
-#include <stddef.h>
+#include <palacios/vmm_types.h>
+
 
 void* memset(void* s, int c, size_t n);
 void* memcpy(void *dst, const void* src, size_t n);
@@ -45,6 +46,7 @@ size_t strnlen(const char *s, size_t maxlen);
 int strcmp(const char* s1, const char* s2);
 int strncmp(const char* s1, const char* s2, size_t limit);
 char *strcat(char *s1, const char *s2);
+char *strncat(char *s1, const char *s2, size_t limit);
 char *strcpy(char *dest, const char *src);
 char *strncpy(char *dest, const char *src, size_t limit);
 char *strdup(const char *s1);
@@ -54,7 +56,22 @@ char *strrchr(const char *s, int c);
 char *strpbrk(const char *s, const char *accept);
 
 
-double ceil(double x);
+
+
+
+#define isspace(c)           (c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v')
+#define isascii(c)     (((c) & ~0x7f) == 0)
+#define isupper(c)     ((c) >= 'A' && (c) <= 'Z')
+#define islower(c)     ((c) >= 'a' && (c) <= 'z')
+#define isalpha(c)     (isupper(c) || islower(c))
+#define isdigit(c)     ((c) >= '0' && (c) <= '9')
+#define isxdigit(c)    (isdigit(c) \
+                         || ((c) >= 'A' && (c) <= 'F') \
+                         || ((c) >= 'a' && (c) <= 'f'))
+#define isprint(c)     ((c) >= ' ' && (c) <= '~')
+
+#define toupper(c)     ((c) - 0x20 * (((c) >= 'a') && ((c) <= 'z')))
+#define tolower(c)     ((c) + 0x20 * (((c) >= 'A') && ((c) <= 'Z')))
 
 
 #endif // !__V3VEE__