devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Second attempt at making %ss utf8-clean

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30509 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Frank Gevaerts 2011-09-11 15:54:56 +00:00
parent bce46a755d
commit 78a0d49bdb
1 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
apps/gui/skin_engine/skin_tokens.c
View file

@ -874,24 +874,29 @@ const char *get_token_value(struct gui_wps *gwps,
struct substring *ss = token->value.data;
const char *token_val = get_token_value(gwps, ss->token, offset,
buf, buf_size, intval);
int ret_len = ss->length;
if (token_val)
{
int len = utf8length(token_val);
if (len < ss->start)
int start_byte, end_byte, byte_len;
int utf8_len = utf8length(token_val);
if (utf8_len < ss->start)
return NULL;
int realstart = utf8seek(token_val, ss->start);
if (ret_len < 0)
ret_len = strlen(token_val) - realstart;
if (token_val != buf)
{
memcpy(buf, &token_val[realstart], ret_len);
}
start_byte = utf8seek(token_val, ss->start);
if (ss->length < 0 || (ss->start + ss->length) > utf8_len)
end_byte = strlen(token_val);
else
{
buf = &buf[realstart];
}
buf[ret_len] = '\0';
end_byte = utf8seek(token_val, ss->start + ss->length);
byte_len = end_byte - start_byte;
if (token_val != buf)
memcpy(buf, &token_val[start_byte], byte_len);
else
buf = &buf[start_byte];
buf[byte_len] = '\0';
return buf;
}
return NULL;