From 3d4701a6e41616cf581a297bab1451cf2db70249 Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Tue, 14 Jul 2009 13:57:45 +0000 Subject: 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 --- apps/talk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps/talk.c') 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) #endif /* CONFIG_CODEC == SWCODEC */ talk_initialized = true; - strncpy((char *) last_lang, (char *)global_settings.lang_file, + strlcpy((char *)last_lang, (char *)global_settings.lang_file, MAX_FILENAME); #if CONFIG_CODEC == SWCODEC @@ -755,7 +755,7 @@ static int talk_spell_basename(const char *path, } char buf[MAX_PATH]; /* Spell only the path component after the last slash */ - strncpy(buf, path, MAX_PATH); + strlcpy(buf, path, sizeof(buf)); if(strlen(buf) >1 && buf[strlen(buf)-1] == '/') /* strip trailing slash */ buf[strlen(buf)-1] = '\0'; -- cgit v1.2.3