Index: uspace/app/bdsh/cmds/modules/ls/ls.c
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls.c	(revision 92fd52d7f8133beb8043e6bcd17498477fe735ea)
+++ uspace/app/bdsh/cmds/modules/ls/ls.c	(revision f4b153529231867ef6c64403a465d1f66e1016ca)
@@ -183,5 +183,5 @@
 		getcwd(buff, PATH_MAX);
 	else
-		strncpy(buff, argv[1], PATH_MAX);
+		str_ncpy(buff, argv[1], PATH_MAX);
 
 	scope = ls_scope(buff);
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision 92fd52d7f8133beb8043e6bcd17498477fe735ea)
+++ uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision f4b153529231867ef6c64403a465d1f66e1016ca)
@@ -94,5 +94,5 @@
 	/* Its a good idea to allocate path, plus we (may) need a copy of
 	 * path to tokenize if parents are specified */
-	if (NULL == (tmp = strdup(path))) {
+	if (NULL == (tmp = str_dup(path))) {
 		cli_error(CL_ENOMEM, "%s: path too big?", cmdname);
 		return 1;
Index: uspace/app/bdsh/cmds/modules/touch/touch.c
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/touch.c	(revision 92fd52d7f8133beb8043e6bcd17498477fe735ea)
+++ uspace/app/bdsh/cmds/modules/touch/touch.c	(revision f4b153529231867ef6c64403a465d1f66e1016ca)
@@ -81,5 +81,5 @@
 
 	for (i = 1; i < argc; i ++) {
-		buff = strdup(argv[i]);
+		buff = str_dup(argv[i]);
 		dirp = opendir(buff);
 		if (dirp) {
Index: uspace/app/bdsh/exec.c
===================================================================
--- uspace/app/bdsh/exec.c	(revision 92fd52d7f8133beb8043e6bcd17498477fe735ea)
+++ uspace/app/bdsh/exec.c	(revision f4b153529231867ef6c64403a465d1f66e1016ca)
@@ -81,5 +81,5 @@
 	}
 
-	path_tok = strdup(PATH);
+	path_tok = str_dup(PATH);
 
 	/* Extract the PATH env to a path[] array */
@@ -115,5 +115,5 @@
 	char *tmp;
 
-	tmp = strdup(find_command(cmd));
+	tmp = str_dup(find_command(cmd));
 	free(found);
 
Index: uspace/app/bdsh/input.c
===================================================================
--- uspace/app/bdsh/input.c	(revision 92fd52d7f8133beb8043e6bcd17498477fe735ea)
+++ uspace/app/bdsh/input.c	(revision f4b153529231867ef6c64403a465d1f66e1016ca)
@@ -62,5 +62,5 @@
 		return CL_EFAIL;
 
-	tmp = strdup(usr->line);
+	tmp = str_dup(usr->line);
 
 	cmd[n] = strtok(tmp, " ");
@@ -156,5 +156,5 @@
 	if (str_cmp(line, "") == 0 || str_cmp(line, "\n") == 0)
 		return;
-	usr->line = strdup(line);
+	usr->line = str_dup(line);
 
 	return;
Index: uspace/app/tetris/scores.c
===================================================================
--- uspace/app/tetris/scores.c	(revision 92fd52d7f8133beb8043e6bcd17498477fe735ea)
+++ uspace/app/tetris/scores.c	(revision f4b153529231867ef6c64403a465d1f66e1016ca)
@@ -132,5 +132,5 @@
 	moveto(10 , 10);
 	puts("Insert your name: ");
-	strncpy(scores[NUMSPOTS - 1].hs_name, "Player", MAXLOGNAME);
+	str_ncpy(scores[NUMSPOTS - 1].hs_name, "Player", MAXLOGNAME);
 	i = 6; off = 6;
 
@@ -196,5 +196,5 @@
 	int i;
 	for(i = 0; i < NUMSPOTS; i++) {
-		strncpy(scores[i].hs_name, "HelenOS Team", MAXLOGNAME);
+		str_ncpy(scores[i].hs_name, "HelenOS Team", MAXLOGNAME);
 		scores[i].hs_score = (NUMSPOTS - i) * 200;	
 		scores[i].hs_level = (i + 1 > MAXLEVEL?MAXLEVEL:i + 1);
Index: uspace/app/tetris/tetris.c
===================================================================
--- uspace/app/tetris/tetris.c	(revision 92fd52d7f8133beb8043e6bcd17498477fe735ea)
+++ uspace/app/tetris/tetris.c	(revision f4b153529231867ef6c64403a465d1f66e1016ca)
@@ -312,5 +312,5 @@
 		}
 		if (keys[i] == ' ')
-			strncpy(key_write[i], "<space>", sizeof key_write[i]);
+			str_ncpy(key_write[i], "<space>", sizeof key_write[i]);
 		else {
 			key_write[i][0] = keys[i];