Index: kernel/generic/include/string.h
===================================================================
--- kernel/generic/include/string.h	(revision 20f1597006e19ccb446878b9d52dd70c85ec74cc)
+++ kernel/generic/include/string.h	(revision 561db3f87662526e5b14ca49efc6c1229d0a8a2b)
@@ -42,8 +42,6 @@
 extern int strncmp(const char *src, const char *dst, size_t len);
 extern void strncpy(char *dest, const char *src, size_t len);
-extern char *strcpy(char *dest, const char *src);
 
 extern char *strchr(const char *s, int i);
-extern char *strrchr(const char *s, int i);
 
 #endif
Index: kernel/generic/src/lib/string.c
===================================================================
--- kernel/generic/src/lib/string.c	(revision 20f1597006e19ccb446878b9d52dd70c85ec74cc)
+++ kernel/generic/src/lib/string.c	(revision 561db3f87662526e5b14ca49efc6c1229d0a8a2b)
@@ -142,24 +142,4 @@
 }
 
-/** Copy string.
- *
- * Copy string from src address to dst address.  The copying is done
- * char-by-char until the null character. The source and destination memory
- * areas cannot overlap.
- *
- * @param src		Source string to copy from.
- * @param dst		Destination string to copy to.
- *
- * @return		Address of the destination string.
- */
-char *strcpy(char *dest, const char *src)
-{
-	char *orig = dest;
-	
-	while ((*dest++ = *src++) != '\0');
-
-	return orig;
-}
-
 /** Find first occurence of character in string.
  *
@@ -179,28 +159,4 @@
 }
 
-/** Find last occurence of character in string.
- *
- * @param s	String to search.
- * @param i	Character to look for.
- *
- * @return	Pointer to character in @a s or NULL if not found.
- */
-extern char *strrchr(const char *s, int i)
-{
-	const char *start;
-
-	start = s;
-	if (*s == '\0') return NULL;
-
-	while (*s != '\0') ++s;
-
-	while (s != start) {
-		--s;
-		if (*s == i) return (char *) s;
-	}
-
-	return NULL;
-}
-
 /** @}
  */
Index: kernel/generic/src/proc/task.c
===================================================================
--- kernel/generic/src/proc/task.c	(revision 20f1597006e19ccb446878b9d52dd70c85ec74cc)
+++ kernel/generic/src/proc/task.c	(revision 561db3f87662526e5b14ca49efc6c1229d0a8a2b)
@@ -275,5 +275,5 @@
 
 	namebuf[name_len] = '\0';
-	strcpy(TASK->name, namebuf);
+	strncpy(TASK->name, namebuf, TASK_NAME_BUFLEN);
 
 	return EOK;