5 files changed, 17 insertions, 25 deletions

diff --git a/apps/gui/buttonbar.c b/apps/gui/buttonbar.c
index abf1800bb2..3c343f09ac 100644
--- a/apps/gui/buttonbar.c
+++ b/apps/gui/buttonbar.c
@@ -86,18 +86,15 @@ void gui_buttonbar_set(struct gui_buttonbar * buttonbar,
     gui_buttonbar_unset(buttonbar);
     if(caption1)
     {
-        strncpy(buttonbar->caption[0], caption1, 7);
-        buttonbar->caption[0][7] = 0;
+        strlcpy(buttonbar->caption[0], caption1, BUTTONBAR_CAPTION_LENGTH);
     }
     if(caption2)
     {
-        strncpy(buttonbar->caption[1], caption2, 7);
-        buttonbar->caption[1][7] = 0;
+        strlcpy(buttonbar->caption[1], caption2, BUTTONBAR_CAPTION_LENGTH);
     }
     if(caption3)
     {
-        strncpy(buttonbar->caption[2], caption3, 7);
-        buttonbar->caption[2][7] = 0;
+        strlcpy(buttonbar->caption[2], caption3, BUTTONBAR_CAPTION_LENGTH);
     }
 }
 
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index f480f616a2..c0923a9ab5 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -659,8 +659,7 @@ static char* get_dir(char* buf, int buf_size, const char* path, int level)
         return NULL;
 
     len = MIN(last_sep - sep, buf_size - 1);
-    strncpy(buf, sep + 1, len);
-    buf[len] = 0;
+    strlcpy(buf, sep + 1, len + 1);
     return buf;
 }
 
@@ -1183,12 +1182,12 @@ static const char *get_token_value(struct gui_wps *gwps,
             {
                 /* we need 11 characters (full line) for
                     progress-bar */
-                strncpy(buf, "           ", buf_size);
+                strlcpy(buf, "           ", buf_size);
             }
             else
             {
                 /* Tell the user if we have an OldPlayer */
-                strncpy(buf, " <Old LCD> ", buf_size);
+                strlcpy(buf, " <Old LCD> ", buf_size);
             }
             return buf;
 #endif
@@ -1254,11 +1253,11 @@ static const char *get_token_value(struct gui_wps *gwps,
                     break;
                 case 2:
                 case 4:
-                    strncpy(buf, id3->track_gain_string, buf_size);
+                    strlcpy(buf, id3->track_gain_string, buf_size);
                     break;
                 case 3:
                 case 5:
-                    strncpy(buf, id3->album_gain_string, buf_size);
+                    strlcpy(buf, id3->album_gain_string, buf_size);
                     break;
             }
             return buf;
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index 7b6c489bf3..01259c4136 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -76,7 +76,7 @@ char *option_get_valuestring(const struct settings_list *setting,
     if ((setting->flags & F_BOOL_SETTING) == F_BOOL_SETTING)
     {
         bool val = (bool)temp_var;
-        strncpy(buffer, str(val? setting->bool_setting->lang_yes :
+        strlcpy(buffer, str(val? setting->bool_setting->lang_yes :
                                  setting->bool_setting->lang_no), buf_len);
     }
 #if 0 /* probably dont need this one */
@@ -137,7 +137,7 @@ 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)
             {
-                strncpy(buffer, str(info->talks[(int)temp_var]), buf_len);
+                strlcpy(buffer, str(info->talks[(int)temp_var]), buf_len);
             }
             else
             {
@@ -149,7 +149,7 @@ char *option_get_valuestring(const struct settings_list *setting,
         {
             int value= (int)temp_var;
             char *val = P2STR(setting->choice_setting->desc[value]);
-            strncpy(buffer, val, buf_len);
+            strlcpy(buffer, val, buf_len);
         }
     }
     return buffer;
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index 47dcb4ead1..5e215090f5 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -617,7 +617,7 @@ static void gui_statusbar_time(struct screen * display, struct tm *time)
         snprintf(buffer, sizeof(buffer), "%02d:%02d", hour, minute);
     }
     else {
-        strncpy(buffer, "--:--", sizeof buffer);
+        strlcpy(buffer, "--:--", sizeof(buffer));
     }
     display->setfont(FONT_SYSFIXED);
     display->getstringsize(buffer, &width, &height);
@@ -626,7 +626,6 @@ static void gui_statusbar_time(struct screen * display, struct tm *time)
                         STATUSBAR_Y_POS, buffer);
     }
     display->setfont(FONT_UI);
-
 }
 #endif
 
@@ -758,14 +757,14 @@ static void gui_statusbar_icon_recording_info(struct screen * display)
     if (global_settings.rec_source == AUDIO_SRC_SPDIF)
     {
         /* Can't measure S/PDIF sample rate on Archos/Sim yet */
-        strncpy(buffer, "--", sizeof(buffer));
+        strlcpy(buffer, "--", sizeof(buffer));
     }
     else
 #endif /* HAVE_SPDIF_IN */
     {
         static char const * const freq_strings[12] =
         { "44", "48", "32", "22", "24", "16" };
-        strncpy(buffer, freq_strings[global_settings.rec_frequency],
+        strlcpy(buffer, freq_strings[global_settings.rec_frequency],
                 sizeof(buffer));
     }
 
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c
index 09bcab8443..8ae83924c2 100644
--- a/apps/gui/wps_parser.c
+++ b/apps/gui/wps_parser.c
@@ -1489,8 +1489,7 @@ static bool wps_parse(struct wps_data *data, const char *wps_bufptr)
                             break;
                         }
 
-                        strncpy(stringbuf, string_start, len);
-                        *(stringbuf + len) = '\0';
+                        strlcpy(stringbuf, string_start, len+1);
 
                         data->strings[data->num_strings] = stringbuf;
                         stringbuf += len + 1;
@@ -1781,11 +1780,9 @@ bool wps_data_load(struct wps_data *wps_data,
 #ifdef HAVE_LCD_BITMAP
         /* get the bitmap dir */
         char bmpdir[MAX_PATH];
-        size_t bmpdirlen;
         char *dot = strrchr(buf, '.');
-        bmpdirlen = dot - buf;
-        strncpy(bmpdir, buf, dot - buf);
-        bmpdir[bmpdirlen] = 0;
+
+        strlcpy(bmpdir, buf, dot - buf + 1);
 
         /* load the bitmaps that were found by the parsing */
         if (!load_wps_bitmaps(wps_data, bmpdir)) {