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/misc.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/misc.c')
-rw-r--r-- | apps/misc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/misc.c b/apps/misc.c index cf356a37f9..e6f8ca840b 100644 --- a/apps/misc.c +++ b/apps/misc.c | |||
@@ -814,15 +814,13 @@ char *strip_extension(char* buffer, int buffer_size, const char *filename) | |||
814 | { | 814 | { |
815 | len = dot - filename; | 815 | len = dot - filename; |
816 | len = MIN(len, buffer_size); | 816 | len = MIN(len, buffer_size); |
817 | strncpy(buffer, filename, len); | ||
818 | } | 817 | } |
819 | else | 818 | else |
820 | { | 819 | { |
821 | len = buffer_size; | 820 | len = buffer_size; |
822 | strncpy(buffer, filename, buffer_size); | ||
823 | } | 821 | } |
824 | 822 | ||
825 | buffer[len] = 0; | 823 | strlcpy(buffer, filename, len + 1); |
826 | 824 | ||
827 | return buffer; | 825 | return buffer; |
828 | } | 826 | } |