More libc functions, and build-as-c fixes.

[polintos/scott/priv.git] / include / c / std / string.h

diff --git a/include/c/std/string.h b/include/c/std/string.h
index e457ed59081462f325115a095cc452e778549eee..55261598682edaab7723d28170600185347d8657 100644 (file)
--- a/include/c/std/string.h
+++ b/include/c/std/string.h
@@ -7,13 +7,29 @@
 extern "C" {
 #endif
 
-void *memcpy(void *dest, const void *src, size_t len);
-void *memset(void *block, int count, size_t len);
-int memcmp(const void *b1, const void *b2, size_t len);
-size_t strlen(const char *s);
+       void *memcpy(void *dest, const void *src, size_t len);
+       void *memmove(void *dest, const void *src, size_t len);
+       int memcmp(const void *b1, const void *b2, size_t len);
+       void *memset(void *block, int count, size_t len);
+       size_t strnlen(const char *s, size_t n);
+       size_t strlen(const char *s);
+       char *strcpy(char *dest, const char *src);
+       char *strncpy(char *dest, const char *src, size_t len);
+       char *strcat(char *dest, const char *src);
+       char *strncat(char *dest, const char *src, size_t len);
+       int strcmp(const char *s1, const char *s2);
+       int strncmp(const char *s1, const char *s2, int n);
 
 #ifdef __cplusplus
+       char *strchr(char *s, int c);
 }
+
+static inline const char *strchr(const char *s, int c)
+{
+       return const_cast<const char *>(strchr(const_cast<char *>(s), c));
+}
+#else
+char *strchr(const char *s, int c);
 #endif
 
 #endif