6 files changed, 10 insertions, 11 deletions

diff --git a/apps/gui/folder_select.c b/apps/gui/folder_select.c
index 50d25e7305..a76d77562b 100644
--- a/apps/gui/folder_select.c
+++ b/apps/gui/folder_select.c
@@ -185,7 +185,7 @@ static struct folder* load_folder(struct folder* parent, char *folder)
         if (len >= sizeof(fullpath))
             goto fail;
     }
-    strlcpy(&fullpath[len], folder, sizeof(fullpath) - len);
+    strmemccpy(&fullpath[len], folder, sizeof(fullpath) - len);
     logf("load_folder: [%s]", fullpath);
 
     dir = opendir(fullpath);
@@ -518,7 +518,7 @@ static int select_paths(struct folder* root, const char* filenames)
         lastfnp = fnp;
         if (len <= 0 || len + 1 >= buflen)
             continue;
-        strlcpy(buf, sstr, len + 1);
+        strmemccpy(buf, sstr, len + 1);
         struct child *item = find_from_filename(buf, root);
         if (item)
             item->state = SELECTED;
@@ -563,7 +563,7 @@ static void save_folders_r(struct folder *root, char* dst, size_t maxlen, size_t
                 int dlen = strlen(dst);
                 if (dlen + len >= maxlen)
                     continue;
-                strlcpy(&dst[dlen], buffer_front, maxlen - dlen);
+                strmemccpy(&dst[dlen], buffer_front, maxlen - dlen);
             }
             else
             {
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index e154467428..4687367fba 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -68,8 +68,8 @@ const char *option_get_valuestring(const struct settings_list *setting,
     if ((setting->flags & F_BOOL_SETTING) == F_BOOL_SETTING)
     {
         bool val = (bool)temp_var;
-        strlcpy(buffer, str(val? setting->bool_setting->lang_yes :
-                                 setting->bool_setting->lang_no), buf_len);
+        strmemccpy(buffer, str(val? setting->bool_setting->lang_yes :
+                                    setting->bool_setting->lang_no), buf_len);
     }
 #if 0 /* probably dont need this one */
     else if ((setting->flags & F_FILENAME) == F_FILENAME)
@@ -121,7 +121,7 @@ const char *option_get_valuestring(const struct settings_list *setting,
             const struct choice_setting *info = setting->choice_setting;
             if (info->talks[(int)temp_var] < LANG_LAST_INDEX_IN_ARRAY)
             {
-                strlcpy(buffer, str(info->talks[(int)temp_var]), buf_len);
+                strmemccpy(buffer, str(info->talks[(int)temp_var]), buf_len);
             }
             else
             {
@@ -133,7 +133,7 @@ const char *option_get_valuestring(const struct settings_list *setting,
         {
             int value = (int)temp_var;
             char *val = P2STR(setting->choice_setting->desc[value]);
-            strlcpy(buffer, val, buf_len);
+            strmemccpy(buffer, val, buf_len);
         }
     }
     return str;
diff --git a/apps/gui/skin_engine/skin_backdrops.c b/apps/gui/skin_engine/skin_backdrops.c
index 215667d585..8be40d1ce2 100644
--- a/apps/gui/skin_engine/skin_backdrops.c
+++ b/apps/gui/skin_engine/skin_backdrops.c
@@ -137,7 +137,7 @@ int skin_backdrop_assign(char* backdrop, char *bmpdir,
     }
     if (free >= 0)
     {
-        strlcpy(backdrops[free].name, filename, MAX_PATH);
+        strmemccpy(backdrops[free].name, filename, MAX_PATH);
         backdrops[free].buffer = NULL;
         backdrops[free].screen = screen;
         backdrops[free].ref_count = 1;
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 419e49810d..4e3b7e4d12 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -2548,7 +2548,7 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data,
     {
         /* get the bitmap dir */
         char *dot = strrchr(buf, '.');
-        strlcpy(bmpdir, buf, dot - buf + 1);
+        strmemccpy(bmpdir, buf, dot - buf + 1);
     }
     else
     {
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index a1d0a4b840..6d9d489a17 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -114,7 +114,7 @@ char* get_dir(char* buf, int buf_size, const char* path, int level)
         return NULL;
 
     len = MIN(last_sep - sep, buf_size - 1);
-    strlcpy(buf, sep + 1, len + 1);
+    strmemccpy(buf, sep + 1, len + 1);
     return buf;
 }
 
diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c
index 5d2b65846d..d6dddf5cd2 100644
--- a/apps/gui/statusbar-skinned.c
+++ b/apps/gui/statusbar-skinned.c
@@ -27,7 +27,6 @@
 #include "appevents.h"
 #include "screens.h"
 #include "screen_access.h"
-#include "strlcpy.h"
 #include "skin_parser.h"
 #include "skin_buffer.h"
 #include "skin_engine/skin_engine.h"