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/bookmark.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/bookmark.c')
-rw-r--r-- | apps/bookmark.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c index 8c3cc48391..892a3d35b2 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c | |||
@@ -1002,17 +1002,14 @@ static bool parse_bookmark(const char *bookmark, | |||
1002 | if (resume_file != NULL) | 1002 | if (resume_file != NULL) |
1003 | { | 1003 | { |
1004 | size_t len = (end == NULL) ? strlen(s) : (size_t) (end - s); | 1004 | size_t len = (end == NULL) ? strlen(s) : (size_t) (end - s); |
1005 | |||
1006 | len = MIN(resume_file_size - 1, len); | 1005 | len = MIN(resume_file_size - 1, len); |
1007 | strncpy(resume_file, s, len); | 1006 | strlcpy(resume_file, s, len + 1); |
1008 | resume_file[len] = 0; | ||
1009 | } | 1007 | } |
1010 | 1008 | ||
1011 | if (end != NULL && file_name != NULL) | 1009 | if (end != NULL && file_name != NULL) |
1012 | { | 1010 | { |
1013 | end++; | 1011 | end++; |
1014 | strncpy(file_name, end, MAX_PATH - 1); | 1012 | strlcpy(file_name, end, MAX_PATH); |
1015 | file_name[MAX_PATH - 1] = 0; | ||
1016 | } | 1013 | } |
1017 | 1014 | ||
1018 | return true; | 1015 | return true; |