diff options
Diffstat (limited to 'apps/recorder')
-rw-r--r-- | apps/recorder/albumart.c | 5 | ||||
-rw-r--r-- | apps/recorder/pcm_record.c | 8 | ||||
-rw-r--r-- | apps/recorder/radio.c | 5 | ||||
-rw-r--r-- | apps/recorder/recording.c | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/apps/recorder/albumart.c b/apps/recorder/albumart.c index 6bd2adade3..a378c332b3 100644 --- a/apps/recorder/albumart.c +++ b/apps/recorder/albumart.c | |||
@@ -66,8 +66,7 @@ static char* strip_filename(char* buf, int buf_size, const char* fullpath) | |||
66 | } | 66 | } |
67 | 67 | ||
68 | len = MIN(sep - fullpath + 1, buf_size - 1); | 68 | len = MIN(sep - fullpath + 1, buf_size - 1); |
69 | strncpy(buf, fullpath, len); | 69 | strlcpy(buf, fullpath, len + 1); |
70 | buf[len] = 0; | ||
71 | return (sep + 1); | 70 | return (sep + 1); |
72 | } | 71 | } |
73 | 72 | ||
@@ -266,7 +265,7 @@ bool search_albumart_files(const struct mp3entry *id3, const char *size_string, | |||
266 | if (!found) | 265 | if (!found) |
267 | return false; | 266 | return false; |
268 | 267 | ||
269 | strncpy(buf, path, buflen); | 268 | strlcpy(buf, path, buflen); |
270 | logf("Album art found: %s", path); | 269 | logf("Album art found: %s", path); |
271 | return true; | 270 | return true; |
272 | } | 271 | } |
diff --git a/apps/recorder/pcm_record.c b/apps/recorder/pcm_record.c index 8657aee1ba..d1dc03113d 100644 --- a/apps/recorder/pcm_record.c +++ b/apps/recorder/pcm_record.c | |||
@@ -529,7 +529,7 @@ static bool pcmrec_fnq_is_full(void) | |||
529 | /* queue another filename - will overwrite oldest one if full */ | 529 | /* queue another filename - will overwrite oldest one if full */ |
530 | static bool pcmrec_fnq_add_filename(const char *filename) | 530 | static bool pcmrec_fnq_add_filename(const char *filename) |
531 | { | 531 | { |
532 | strncpy(fn_queue + fnq_wr_pos, filename, MAX_PATH); | 532 | strlcpy(fn_queue + fnq_wr_pos, filename, MAX_PATH); |
533 | fnq_wr_pos = FNQ_NEXT(fnq_wr_pos); | 533 | fnq_wr_pos = FNQ_NEXT(fnq_wr_pos); |
534 | 534 | ||
535 | if (fnq_rd_pos != fnq_wr_pos) | 535 | if (fnq_rd_pos != fnq_wr_pos) |
@@ -550,7 +550,7 @@ static bool pcmrec_fnq_replace_tail(const char *filename) | |||
550 | 550 | ||
551 | pos = FNQ_PREV(fnq_wr_pos); | 551 | pos = FNQ_PREV(fnq_wr_pos); |
552 | 552 | ||
553 | strncpy(fn_queue + pos, filename, MAX_PATH); | 553 | strlcpy(fn_queue + pos, filename, MAX_PATH); |
554 | 554 | ||
555 | return true; | 555 | return true; |
556 | } /* pcmrec_fnq_replace_tail */ | 556 | } /* pcmrec_fnq_replace_tail */ |
@@ -562,7 +562,7 @@ static bool pcmrec_fnq_get_filename(char *filename) | |||
562 | return false; | 562 | return false; |
563 | 563 | ||
564 | if (filename) | 564 | if (filename) |
565 | strncpy(filename, fn_queue + fnq_rd_pos, MAX_PATH); | 565 | strlcpy(filename, fn_queue + fnq_rd_pos, MAX_PATH); |
566 | 566 | ||
567 | fnq_rd_pos = FNQ_NEXT(fnq_rd_pos); | 567 | fnq_rd_pos = FNQ_NEXT(fnq_rd_pos); |
568 | return true; | 568 | return true; |
@@ -976,7 +976,7 @@ static void pcmrec_new_stream(const char *filename, /* next file name */ | |||
976 | bool did_flush = false; /* did a flush occurr? */ | 976 | bool did_flush = false; /* did a flush occurr? */ |
977 | 977 | ||
978 | if (filename) | 978 | if (filename) |
979 | strncpy(path, filename, MAX_PATH); | 979 | strlcpy(path, filename, MAX_PATH); |
980 | queue_reply(&pcmrec_queue, 0); /* We have all we need */ | 980 | queue_reply(&pcmrec_queue, 0); /* We have all we need */ |
981 | 981 | ||
982 | data.pre_chunk = NULL; | 982 | data.pre_chunk = NULL; |
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 68c45c4f01..c5729ba8b2 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -1138,7 +1138,7 @@ void radio_load_presets(char *filename) | |||
1138 | } | 1138 | } |
1139 | /* Temporary preset, loaded until player shuts down. */ | 1139 | /* Temporary preset, loaded until player shuts down. */ |
1140 | else if(filename[0] == '/') | 1140 | else if(filename[0] == '/') |
1141 | strncpy(filepreset, filename, sizeof(filepreset)); | 1141 | strlcpy(filepreset, filename, sizeof(filepreset)); |
1142 | /* Preset from default directory. */ | 1142 | /* Preset from default directory. */ |
1143 | else | 1143 | else |
1144 | snprintf(filepreset, sizeof(filepreset), "%s/%s.fmr", | 1144 | snprintf(filepreset, sizeof(filepreset), "%s/%s.fmr", |
@@ -1159,8 +1159,7 @@ void radio_load_presets(char *filename) | |||
1159 | { | 1159 | { |
1160 | struct fmstation * const fms = &presets[num_presets]; | 1160 | struct fmstation * const fms = &presets[num_presets]; |
1161 | fms->frequency = f; | 1161 | fms->frequency = f; |
1162 | strncpy(fms->name, name, MAX_FMPRESET_LEN); | 1162 | strlcpy(fms->name, name, MAX_FMPRESET_LEN+1); |
1163 | fms->name[MAX_FMPRESET_LEN] = '\0'; | ||
1164 | num_presets++; | 1163 | num_presets++; |
1165 | } | 1164 | } |
1166 | } | 1165 | } |
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index d7ab9c795c..0a890d03da 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -964,7 +964,7 @@ static char * reclist_get_name(int selected_item, void * data, | |||
964 | } | 964 | } |
965 | else | 965 | else |
966 | { | 966 | { |
967 | strncpy(buffer, str(LANG_RECORDING_FILENAME), buffer_len); | 967 | strlcpy(buffer, str(LANG_RECORDING_FILENAME), buffer_len); |
968 | } | 968 | } |
969 | break; | 969 | break; |
970 | } | 970 | } |