Index: uspace/lib/posix/string.c
===================================================================
--- uspace/lib/posix/string.c	(revision acc3f82cbdd73903cb30492872da8faf54de8314)
+++ uspace/lib/posix/string.c	(revision ef6dd3ff76d4e4721f5217c80db03a9033e4a9ec)
@@ -38,80 +38,215 @@
 #include "string.h"
 
-#include <libc/assert.h>
-
+#include <assert.h>
 #include <str_error.h>
-
-/**
- *
- * @param dest
- * @param src
- * @return
+#include <stdlib.h>
+#include <errno.h>
+
+/* Defined for convenience. Returns pointer to the terminating nul character.
+ */
+static char *strzero(const char *s)
+{
+	while (*s != '\0')
+		s ++;
+
+	return (char*) s;
+}
+
+/* Returns true if s2 is a prefix of s1.
+ */
+static bool begins_with(const char *s1, const char *s2)
+{
+	while (*s1 == *s2 && *s2 != '\0') {
+		s1 ++;
+		s2 ++;
+	}
+	
+	/* true if the end was reached */
+	return *s2 == '\0';
+}
+
+/* The same as strpbrk, except it returns pointer to the nul terminator
+ * if no occurence is found.
+ */
+static char *strpbrk_null(const char *s1, const char *s2)
+{
+	while (!posix_strchr(s2, *s1)) {
+		++ s1;
+	}
+	
+	return (char *) s1;
+}
+
+/**
+ *
+ * @param dest
+ * @param src
+ * @return dest
  */
 char *posix_strcpy(char *dest, const char *src)
 {
-	// TODO
-	return 0;
-}
-
-/**
- *
- * @param dest
- * @param src
- * @param n
- * @return
+	posix_stpcpy(dest, src);
+	return dest;
+}
+
+/**
+ *
+ * @param dest
+ * @param src
+ * @param n
+ * @return dest
  */
 char *posix_strncpy(char *dest, const char *src, size_t n)
 {
-	// TODO
-	return 0;
-}
-
-/**
- *
- * @param dest
- * @param src
- * @return
+	posix_stpncpy(dest, src, n);
+	return dest;
+}
+
+/**
+ *
+ * @param dest
+ * @param src
+ * @return Pointer to the nul character in the dest string
+ */
+char *posix_stpcpy(char *restrict dest, const char *restrict src)
+{
+	assert(dest != NULL);
+	assert(src != NULL);
+
+	for (size_t i = 0; ; ++ i) {
+		dest[i] = src[i];
+		
+		if (src[i] == '\0') {
+			/* pointer to the terminating nul character */
+			return &dest[i];
+		}
+	}
+	
+	/* unreachable */
+	return NULL;
+}
+
+/**
+ *
+ * @param dest
+ * @param src
+ * @param n
+ * @return Pointer to the first written nul character or &dest[n]
+ */
+char *posix_stpncpy(char *restrict dest, const char *restrict src, size_t n)
+{
+	assert(dest != NULL);
+	assert(src != NULL);
+
+	for (size_t i = 0; i < n; ++ i) {
+		dest[i] = src[i];
+	
+		/* the standard requires that nul characters
+		 * are appended to the length of n, in case src is shorter
+		 */
+		if (src[i] == '\0') {
+			char *result = &dest[i];
+			for (++ i; i < n; ++ i) {
+				dest[i] = '\0';
+			}
+			return result;
+		}
+	}
+	
+	return &dest[n];
+}
+
+/**
+ *
+ * @param dest
+ * @param src
+ * @return dest
  */
 char *posix_strcat(char *dest, const char *src)
 {
-	// TODO
-	return 0;
-}
-
-/**
- *
- * @param dest
- * @param src
- * @param n
- * @return
+	assert(dest != NULL);
+	assert(src != NULL);
+
+	posix_strcpy(strzero(dest), src);
+	return dest;
+}
+
+/**
+ *
+ * @param dest
+ * @param src
+ * @param n
+ * @return dest
  */
 char *posix_strncat(char *dest, const char *src, size_t n)
 {
-	// TODO
-	return 0;
-}
-
-/**
- * 
- * @param dest
- * @param src
- * @param n
- * @return
- */
-void *posix_mempcpy(void *dest, const void *src, size_t n)
-{
-	// TODO
-	return 0;
-}
-
-/**
- * 
+	assert(dest != NULL);
+	assert(src != NULL);
+
+	char *zeroptr = posix_strncpy(strzero(dest), src, n);
+	/* strncpy doesn't append the nul terminator, so we do it here */
+	zeroptr[n] = '\0';
+	return dest;
+}
+
+/**
+ *
+ * @param dest
+ * @param src
+ * @param c
+ * @param n
+ * @return Pointer to the first byte after c in dest if found, NULL otherwise.
+ */
+void *posix_memccpy(void *restrict dest, const void *restrict src, int c, size_t n)
+{
+	assert(dest != NULL);
+	assert(src != NULL);
+	
+	unsigned char* bdest = dest;
+	const unsigned char* bsrc = src;
+	
+	for (size_t i = 0; i < n; ++ i) {
+		bdest[i] = bsrc[i];
+	
+		if (bsrc[i] == (unsigned char) c) {
+			/* pointer to the next byte */
+			return &bdest[i + 1];
+		}
+	}
+	
+	return NULL;
+}
+
+/**
+ *
  * @param s
- * @return
+ * @return Newly allocated string
  */
 char *posix_strdup(const char *s)
 {
-	// TODO
-	return 0;
+	// FIXME: SIZE_MAX doesn't work
+	return posix_strndup(s, STR_NO_LIMIT);
+}
+
+/**
+ *
+ * @param s
+ * @param n
+ * @return Newly allocated string of length at most n
+ */
+char *posix_strndup(const char *s, size_t n)
+{
+	assert(s != NULL);
+
+	size_t len = posix_strnlen(s, n);
+	char *dup = malloc(len + 1);
+	if (dup == NULL) {
+		return NULL;
+	}
+
+	memcpy(dup, s, len);
+	dup[len] = '\0';
+
+	return dup;
 }
 
@@ -121,9 +256,21 @@
  * @param mem2
  * @param n
- * @return
+ * @return Difference of the first pair of inequal bytes,
+ *          or 0 if areas have the same content
  */
 int posix_memcmp(const void *mem1, const void *mem2, size_t n)
 {
-	// TODO
+	assert(mem1 != NULL);
+	assert(mem2 != NULL);
+
+	const unsigned char *s1 = mem1;
+	const unsigned char *s2 = mem2;
+	
+	for (size_t i = 0; i < n; ++ i) {
+		if (s1[i] != s2[i]) {
+			return s2[i] - s1[i];
+		}
+	}
+	
 	return 0;
 }
@@ -137,6 +284,8 @@
 int posix_strcmp(const char *s1, const char *s2)
 {
-	// TODO
-	return 0;
+	assert(s1 != NULL);
+	assert(s2 != NULL);
+
+	return posix_strncmp(s1, s2, STR_NO_LIMIT);
 }
 
@@ -150,30 +299,16 @@
 int posix_strncmp(const char *s1, const char *s2, size_t n)
 {
-	// TODO
-	return 0;
-}
-
-/**
- * 
- * @param s1
- * @param s2
- * @return
- */
-int posix_strcasecmp(const char *s1, const char *s2)
-{
-	// TODO
-	return 0;
-}
-
-/**
- * 
- * @param s1
- * @param s2
- * @param n
- * @return
- */
-int posix_strncasecmp(const char *s1, const char *s2, size_t n)
-{
-	// TODO
+	assert(s1 != NULL);
+	assert(s2 != NULL);
+
+	for (size_t i = 0; i < n; ++ i) {
+		if (s1[i] != s2[i]) {
+			return s2[i] - s1[i];
+		}
+		if (s1[i] == '\0') {
+			break;
+		}
+	}
+
 	return 0;
 }
@@ -188,18 +323,14 @@
 void *posix_memchr(const void *mem, int c, size_t n)
 {
-	// TODO
-	return 0;
-}
-
-/**
- * 
- * @param mem
- * @param c
- * @return
- */
-void *posix_rawmemchr(const void *mem, int c)
-{
-	// TODO
-	return 0;
+	assert(mem != NULL);
+	
+	const unsigned char *s = mem;
+	
+	for (size_t i = 0; i < n; ++ i) {
+		if (s[i] == (unsigned char) c) {
+			return (void *) &s[i];
+		}
+	}
+	return NULL;
 }
 
@@ -212,6 +343,19 @@
 char *posix_strchr(const char *s, int c)
 {
-	// TODO
-	return 0;
+	assert(s != NULL);
+	
+	/* special handling for the case that zero is searched for */
+	if (c == '\0')
+		return strzero(s);
+	
+	/* otherwise just loop through the string until found */
+	while (*s != (char) c) {
+		if (*s == '\0')
+			return NULL;
+
+		s ++;
+	}
+	
+	return (char *) s;
 }
 
@@ -224,5 +368,163 @@
 char *posix_strrchr(const char *s, int c)
 {
-	// TODO
+	assert(s != NULL);
+	
+	const char *ptr = strzero(s);
+	
+	/* the same as in strchr, except it loops in reverse direction */
+	while (*ptr != (char) c) {
+		if (ptr == s)
+			return NULL;
+
+		ptr ++;
+	}
+
+	return (char *) ptr;
+}
+
+/**
+ *
+ * @param s1
+ * @param s2
+ * @return
+ */
+char *posix_strpbrk(const char *s1, const char *s2)
+{
+	assert(s1 != NULL);
+	assert(s2 != NULL);
+
+	char *ptr = strpbrk_null(s1, s2);
+	return (*ptr == '\0') ? NULL : ptr;
+}
+
+/**
+ *
+ * @param s1
+ * @param s2
+ * @return
+ */
+size_t posix_strcspn(const char *s1, const char *s2)
+{
+	assert(s1 != NULL);
+	assert(s2 != NULL);
+
+	char *ptr = strpbrk_null(s1, s2);
+	return (size_t) (ptr - s1);
+}
+
+/**
+ *
+ * @param s1
+ * @param s2
+ * @return
+ */
+size_t posix_strspn(const char *s1, const char *s2)
+{
+	assert(s1 != NULL);
+	assert(s2 != NULL);
+
+	const char *ptr;
+	for (ptr = s1; *ptr != '\0'; ++ ptr) {
+		if (!posix_strchr(s2, *ptr))
+			break;
+	}
+	return ptr - s1;
+}
+
+/**
+ *
+ * @param s1
+ * @param s2
+ * @return
+ */
+char *posix_strstr(const char *s1, const char *s2)
+{
+	assert(s1 != NULL);
+	assert(s2 != NULL);
+
+	/* special case - needle is an empty string */
+	if (*s2 == '\0')
+		return (char *) s1;
+
+	// TODO: use faster algorithm
+	/* check for prefix from every position - quadratic complexity */
+	while (*s1 != '\0') {
+		if (begins_with(s1, s2))
+			return (char *) s1;
+		
+		s1 ++;
+	}
+	
+	return NULL;
+}
+
+/**
+ * Currently ignores locale and just calls strcmp.
+ *
+ * @param s1
+ * @param s2
+ * @return
+ */
+int posix_strcoll(const char *s1, const char *s2)
+{
+	assert(s1 != NULL);
+	assert(s2 != NULL);
+
+	return posix_strcmp(s1, s2);
+}
+
+/**
+ * strcoll is equal to strcmp here, so this just makes a copy.
+ *
+ * @param s1
+ * @param s2
+ * @param n
+ * @return
+ */
+size_t posix_strxfrm(char *s1, const char *s2, size_t n)
+{
+	assert(s1 != NULL || n == 0);
+	assert(s2 != NULL);
+
+	size_t len = posix_strlen(s2);
+
+	if (n > len)
+		posix_strcpy(s1, s2);
+
+	return len;
+}
+
+/**
+ *
+ * @param errnum
+ * @return
+ */
+char *posix_strerror(int errnum)
+{
+	/* uses function from libc, we just have to negate errno
+	   (POSIX uses positive errorcodes, HelenOS has negative) */
+	return (char *) str_error (-errnum);
+}
+
+/**
+ *
+ * @param errnum Error code
+ * @param buf    Buffer to store a human readable string to
+ * @param bufsz  Size of buffer pointed to by buf
+ * @return
+ */
+int posix_strerror_r(int errnum, char *buf, size_t bufsz)
+{
+	assert(buf != NULL);
+	
+	char *errstr = posix_strerror(errnum);
+	/* HelenOS str_error can't fail */
+	
+	if (posix_strlen(errstr) + 1 > bufsz) {
+		return -ERANGE;
+	} else {
+		posix_strcpy(buf, errstr);
+	}
+
 	return 0;
 }
@@ -230,88 +532,4 @@
 /**
  *
- * @param s1
- * @param s2
- * @return
- */
-char *posix_strpbrk(const char *s1, const char *s2)
-{
-	// TODO
-	return 0;
-}
-
-/**
- *
- * @param s1
- * @param s2
- * @return
- */
-size_t posix_strcspn(const char *s1, const char *s2)
-{
-	// TODO
-	return 0;
-}
-
-/**
- *
- * @param s1
- * @param s2
- * @return
- */
-size_t posix_strspn(const char *s1, const char *s2)
-{
-	// TODO
-	return 0;
-}
-
-/**
- *
- * @param s1
- * @param s2
- * @return
- */
-char *posix_strstr(const char *s1, const char *s2)
-{
-	// TODO
-	return 0;
-}
-
-/**
- *
- * @param s1
- * @param s2
- * @return
- */
-int posix_strcoll(const char *s1, const char *s2)
-{
-	// TODO
-	return 0;
-}
-
-/**
- *
- * @param s1
- * @param s2
- * @param n
- * @return
- */
-size_t posix_strxfrm(char *s1, const char *s2, size_t n)
-{
-	// TODO
-	return 0;
-}
-
-/**
- *
- * @param errnum
- * @return
- */
-char *posix_strerror(int errnum)
-{
-	// TODO
-	return 0;
-}
-
-/**
- *
  * @param s
  * @return
@@ -319,6 +537,27 @@
 size_t posix_strlen(const char *s)
 {
-	// TODO
-	return 0;
+	assert(s != NULL);
+	
+	return (size_t) (strzero(s) - s);
+}
+
+/**
+ *
+ * @param s
+ * @param n
+ * @return
+ */
+size_t posix_strnlen(const char *s, size_t n)
+{
+	assert(s != NULL);
+	
+	for (size_t sz = 0; sz < n; ++ sz) {
+		
+		if (s[sz] == '\0') {
+			return sz;
+		}
+	}
+	
+	return n;
 }
 
Index: uspace/lib/posix/string.h
===================================================================
--- uspace/lib/posix/string.h	(revision acc3f82cbdd73903cb30492872da8faf54de8314)
+++ uspace/lib/posix/string.h	(revision ef6dd3ff76d4e4721f5217c80db03a9033e4a9ec)
@@ -40,4 +40,25 @@
 #include <str.h>
 
+/* available in str.h
+ *
+ * char *strtok(char *restrict, const char *restrict);
+ * char *strtok_r(char *restrict, const char *restrict, char **restrict);
+ *
+ * available in mem.h
+ *
+ * void *memset(void *, int, size_t);
+ * void *memcpy(void *, const void *, size_t);
+ * void *memmove(void *, const void *, size_t);
+ *
+ * unimplemented due to missing locales
+ *
+ * int      strcoll_l(const char *, const char *, locale_t);
+ * char    *strerror_l(int, locale_t);
+ * size_t   strxfrm_l(char *restrict, const char *restrict, size_t, locale_t);
+ *
+ */
+
+// TODO: provide *_l once there is locale.h
+
 #ifndef NULL
 	#define NULL  ((void *) 0)
@@ -47,8 +68,11 @@
 extern char *posix_strcpy(char *restrict dest, const char *restrict src);
 extern char *posix_strncpy(char *restrict dest, const char *restrict src, size_t n);
+extern char *posix_stpcpy(char *restrict dest, const char *restrict src);
+extern char *posix_stpncpy(char *restrict dest, const char *restrict src, size_t n);
 extern char *posix_strcat(char *restrict dest, const char *restrict src);
 extern char *posix_strncat(char *restrict dest, const char *restrict src, size_t n);
-extern void *posix_mempcpy(void *restrict dest, const void *restrict src, size_t n);
+extern void *posix_memccpy(void *restrict dest, const void *restrict src, int c, size_t n);
 extern char *posix_strdup(const char *s);
+extern char *posix_strndup(const char *s, size_t n);
 
 /* String/Array Comparison */
@@ -56,10 +80,7 @@
 extern int posix_strcmp(const char *s1, const char *s2);
 extern int posix_strncmp(const char *s1, const char *s2, size_t n);
-extern int posix_strcasecmp(const char *s1, const char *s2);
-extern int posix_strncasecmp(const char *s1, const char *s2, size_t n);
 
 /* Search Functions */
 extern void *posix_memchr(const void *mem, int c, size_t n);
-extern void *posix_rawmemchr(const void *mem, int c);
 extern char *posix_strchr(const char *s, int c);
 extern char *posix_strrchr(const char *s, int c);
@@ -75,24 +96,26 @@
 /* Error Messages */
 extern char *posix_strerror(int errnum);
+extern int posix_strerror_r(int errnum, char *buf, size_t bufsz);
 
 /* String Length */
 extern size_t posix_strlen(const char *s);
+extern size_t posix_strnlen(const char *s, size_t n);
 
 #ifndef LIBPOSIX_INTERNAL
 	#define strcpy posix_strcpy
 	#define strncpy posix_strncpy
+	#define stpcpy posix_stpcpy
+	#define stpncpy posix_stpncpy
 	#define strcat posix_strcat
 	#define strncat posix_strncat
-	#define mempcpy posix_mempcpy
+	#define memccpy posix_memccpy
 	#define strdup posix_strdup
+	#define strndup posix_strndup
 
 	#define memcmp posix_memcmp
 	#define strcmp posix_strcmp
 	#define strncmp posix_strncmp
-	#define strcasecmp posix_strcasecmp
-	#define strncasecmp posix_strncasecmp
 
 	#define memchr posix_memchr
-	#define rawmemchr posix_rawmemchr
 	#define strchr posix_strchr
 	#define strrchr posix_strrchr
@@ -106,6 +129,9 @@
 
 	#define strerror posix_strerror
+	#define strerror_r posix_strerror_r
+	#define strsignal(i) ((char*) "SIGNonSense: There are no signals in HelenOS.")
 
 	#define strlen posix_strlen
+	#define strnlen posix_strnlen
 #endif