3 files changed, 5 insertions, 5 deletions

diff --git a/apps/recorder/albumart.c b/apps/recorder/albumart.c
index e94ffcfb80..8991a81848 100644
--- a/apps/recorder/albumart.c
+++ b/apps/recorder/albumart.c
@@ -67,7 +67,7 @@ static char* strip_filename(char* buf, int buf_size, const char* fullpath)
     }
 
     len = MIN(sep - fullpath + 1, buf_size - 1);
-    strlcpy(buf, fullpath, len + 1);
+    strmemccpy(buf, fullpath, len + 1);
     return (sep + 1);
 }
 
@@ -266,7 +266,7 @@ bool search_albumart_files(const struct mp3entry *id3, const char *size_string,
     if (!found)
         return false;
 
-    strlcpy(buf, path, buflen);
+    strmemccpy(buf, path, buflen);
     logf("Album art found: %s", path);
     return true;
 }
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index 45cccdcf8b..f64061d303 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -1063,7 +1063,7 @@ static void kbd_draw_edit_line(struct keyboard_parameters *pm,
     while (*utf8 && i < pm->max_chars_text)
     {
         j = utf8seek(utf8, 1);
-        strlcpy(outline, utf8, j+1);
+        strmemccpy(outline, utf8, j+1);
         sc->getstringsize(outline, &w, NULL);
         sc->putsxy(text_margin + i*pm->text_w + (pm->text_w-w)/2,
                    y, outline);
diff --git a/apps/recorder/pcm_record.c b/apps/recorder/pcm_record.c
index d3d45d3e1c..f7f4c77928 100644
--- a/apps/recorder/pcm_record.c
+++ b/apps/recorder/pcm_record.c
@@ -1352,7 +1352,7 @@ static void mark_stream(const char *path, enum mark_stream_action action)
 
         file->hdr.type = CHUNK_T_STREAM_START;
         file->hdr.size = count;
-        strlcpy(file->path, path, MAX_PATH);
+        strmemccpy(file->path, path, MAX_PATH);
     }
 }
 
@@ -1582,7 +1582,7 @@ static void on_record(const char *filename)
 
     /* Copy path and let caller go */
     char path[MAX_PATH];
-    strlcpy(path, filename, MAX_PATH);
+    strmemccpy(path, filename, MAX_PATH);
 
     queue_reply(&audio_queue, 0);