Index: uspace/lib/libc/generic/vfs/vfs.c
===================================================================
--- uspace/lib/libc/generic/vfs/vfs.c	(revision 9eb362323466c189d4803ce6617716d2403a7a32)
+++ uspace/lib/libc/generic/vfs/vfs.c	(revision 8be693bd3b2be89643a83f1cb8f433a701b8b269)
@@ -535,5 +535,5 @@
 		return NULL;
 	}
-	strcpy(buf, cwd_path);
+	str_ncpy(buf, cwd_path, size);
 	futex_up(&cwd_futex);
 	return buf;
Index: uspace/srv/devmap/devmap.c
===================================================================
--- uspace/srv/devmap/devmap.c	(revision 9eb362323466c189d4803ce6617716d2403a7a32)
+++ uspace/srv/devmap/devmap.c	(revision 8be693bd3b2be89643a83f1cb8f433a701b8b269)
@@ -113,5 +113,5 @@
 	while (item != &devices_list) {
 		device = list_get_instance(item, devmap_device_t, devices);
-		if (0 == strcmp(device->name, name))
+		if (0 == str_cmp(device->name, name))
 			break;
 		item = item->next;