Virtualization
/
jansson
mirror of https://github.com/akheron/jansson
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix dumping of Unicode control codes 

Inside strings, All UTF-8 characters except for \, " and Unicode
control codes are dumped as-is. The control codes that have a special
one-character escape use that escape, and other control codes are
dumped using the \uXXXX escape.
This commit is contained in:
Petri Lehtinen 2009-07-04 22:02:16 +03:00
parent f9c2a113bb
commit 6b14df13cc
1 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/dump.c
View File

@ -66,27 +66,47 @@ static int dump_string(const char *str, dump_func dump, void *data)
return -1;
end = str;
while(*end)
while(1)
{
while(*end && *end != '\\' && *end != '"')
const char *text;
char seq[7];
int length;
while(*end && *end != '\\' && *end != '"' && (*end < 0 || *end > 0x1F))
end++;
if(end != str)
if(end != str) {
if(dump(str, end - str, data))
return -1;
}
if(*end == '\\')
if(!*end)
break;
/* handle \, ", and control codes */
length = 2;
switch(*end)
{
if(dump("\\\\", 2, data))
return -1;
end++;
}
else if(*end == '"')
{
if(dump("\\\"", 2, data))
return -1;
end++;
case '\\': text = "\\\\"; break;
case '\"': text = "\\\""; break;
case '\b': text = "\\b"; break;
case '\f': text = "\\f"; break;
case '\n': text = "\\n"; break;
case '\r': text = "\\r"; break;
case '\t': text = "\\t"; break;
default:
{
sprintf(seq, "\\u00%02x", *end);
text = seq;
length = 6;
break;
}
}
if(dump(text, length, data))
return -1;
end++;
str = end;
}