From bce46a755d65194d71992572e293daa781977818 Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Sun, 11 Sep 2011 15:29:56 +0000 Subject: Make %ss utf8-aware git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30508 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_tokens.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'apps/gui') diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index a4f0814945..51da8c1c18 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -877,18 +877,19 @@ const char *get_token_value(struct gui_wps *gwps, int ret_len = ss->length; if (token_val) { - int len = strlen(token_val); + int len = utf8length(token_val); if (len < ss->start) return NULL; + int realstart = utf8seek(token_val, ss->start); if (ret_len < 0) - ret_len = strlen(token_val) - ss->start; + ret_len = strlen(token_val) - realstart; if (token_val != buf) { - memcpy(buf, &token_val[ss->start], ret_len); + memcpy(buf, &token_val[realstart], ret_len); } else { - buf = &buf[ss->start]; + buf = &buf[realstart]; } buf[ret_len] = '\0'; return buf; -- cgit v1.2.3