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/playlist_catalog.c | |
| parent | c2900a1bacd5d98b57a0d15ea2add1bc08764057 (diff) | |
| download | rockbox-3d4701a6e41616cf581a297bab1451cf2db70249.tar.gz rockbox-3d4701a6e41616cf581a297bab1451cf2db70249.tar.bz2 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/playlist_catalog.c')
| -rw-r--r-- | apps/playlist_catalog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/playlist_catalog.c b/apps/playlist_catalog.c index 84a62e3474..a4950e22e8 100644 --- a/apps/playlist_catalog.c +++ b/apps/playlist_catalog.c @@ -78,7 +78,7 @@ static int initialize_catalog(void) /* fall back to default directory if no or invalid config */ if (default_dir) - strncpy(playlist_dir, PLAYLIST_CATALOG_DEFAULT_DIR, + strlcpy(playlist_dir, PLAYLIST_CATALOG_DEFAULT_DIR, sizeof(playlist_dir)); playlist_dir_length = strlen(playlist_dir); @@ -189,7 +189,7 @@ static char* playlist_callback_name(int selected_item, void* data, { char** playlists = (char**) data; - strncpy(buffer, playlists[selected_item], buffer_len); + strlcpy(buffer, playlists[selected_item], buffer_len); if (buffer[0] != '.' && !(global_settings.show_filename_ext == 1 || (global_settings.show_filename_ext == 3 @@ -478,7 +478,7 @@ bool catalog_add_to_a_playlist(const char* sel, int sel_attr, if (add_to_playlist(playlist, new_playlist, sel, sel_attr) == 0) { - strncpy(most_recent_playlist, playlist+playlist_dir_length+1, + strlcpy(most_recent_playlist, playlist+playlist_dir_length+1, sizeof(most_recent_playlist)); return true; } |