summaryrefslogtreecommitdiff
path: root/apps/talk.c
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2009-07-14 13:57:45 +0000
committerNils Wallménius <nils@rockbox.org>2009-07-14 13:57:45 +0000
commit3d4701a6e41616cf581a297bab1451cf2db70249 (patch)
treef845837c96ffbed7d59ddf8308f3b3e7c40cb8c9 /apps/talk.c
parentc2900a1bacd5d98b57a0d15ea2add1bc08764057 (diff)
downloadrockbox-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/talk.c')
-rw-r--r--apps/talk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/talk.c b/apps/talk.c
index 73c26073b7..b2e25e1f8f 100644
--- a/apps/talk.c
+++ b/apps/talk.c
@@ -533,7 +533,7 @@ void talk_init(void)
533#endif /* CONFIG_CODEC == SWCODEC */ 533#endif /* CONFIG_CODEC == SWCODEC */
534 534
535 talk_initialized = true; 535 talk_initialized = true;
536 strncpy((char *) last_lang, (char *)global_settings.lang_file, 536 strlcpy((char *)last_lang, (char *)global_settings.lang_file,
537 MAX_FILENAME); 537 MAX_FILENAME);
538 538
539#if CONFIG_CODEC == SWCODEC 539#if CONFIG_CODEC == SWCODEC
@@ -755,7 +755,7 @@ static int talk_spell_basename(const char *path,
755 } 755 }
756 char buf[MAX_PATH]; 756 char buf[MAX_PATH];
757 /* Spell only the path component after the last slash */ 757 /* Spell only the path component after the last slash */
758 strncpy(buf, path, MAX_PATH); 758 strlcpy(buf, path, sizeof(buf));
759 if(strlen(buf) >1 && buf[strlen(buf)-1] == '/') 759 if(strlen(buf) >1 && buf[strlen(buf)-1] == '/')
760 /* strip trailing slash */ 760 /* strip trailing slash */
761 buf[strlen(buf)-1] = '\0'; 761 buf[strlen(buf)-1] = '\0';