diff options
author | Nils Wallménius <nils@rockbox.org> | 2009-07-14 13:57:45 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2009-07-14 13:57:45 +0000 |
commit | 3d4701a6e41616cf581a297bab1451cf2db70249 (patch) | |
tree | f845837c96ffbed7d59ddf8308f3b3e7c40cb8c9 /apps/plugins/mp3_encoder.c | |
parent | c2900a1bacd5d98b57a0d15ea2add1bc08764057 (diff) | |
download | rockbox-3d4701a6e41616cf581a297bab1451cf2db70249.tar.gz rockbox-3d4701a6e41616cf581a297bab1451cf2db70249.zip |
FS#10080
* Move strncpy() from core to the pluginlib
* Introduce strlcpy() and use that instead in most places (use memcpy in a few) in core and some plugins
* Drop strncpy() from the codec api as no codec used it
* Bump codec and plugin api versions
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21863 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mp3_encoder.c')
-rw-r--r-- | apps/plugins/mp3_encoder.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 6849daf2f3..9da0d6925f 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2399,9 +2399,8 @@ char mp3_name[80]; | |||
2399 | 2399 | ||
2400 | void get_mp3_filename(const char *wav_name) | 2400 | void get_mp3_filename(const char *wav_name) |
2401 | { | 2401 | { |
2402 | int slen = rb->strlen(wav_name); | 2402 | rb->strlcpy(mp3_name, wav_name, sizeof(mp3_name)); |
2403 | rb->strncpy(mp3_name, wav_name, 79); | 2403 | rb->strlcpy(mp3_name + rb->strlen(mp3_name) - 4, ".mp3", 5); |
2404 | rb->strncpy(mp3_name + slen - 4, ".mp3", 5); | ||
2405 | } | 2404 | } |
2406 | 2405 | ||
2407 | #if CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD | 2406 | #if CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD |