Norse_Harold/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Provide JSON-compatible string escaping

Browse Source 
This was SVN commit r10464.
This commit is contained in:
Ykkrosh 2011-11-04 01:18:34 +00:00
parent 9cbf587e59
commit 4ef66a6950
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/network/StringConverters.h
View File

@ -32,7 +32,7 @@ static inline CStr NetMessageStringConvert(const CStr8& arg)
static inline CStr NetMessageStringConvert(const CStrW& arg)
{
return arg.ToUTF8().EscapeToPrintableASCII();
return arg.EscapeToPrintableASCII();
}
#endif

21
source/ps/CStr.cpp
View File

@ -356,25 +356,26 @@ CStr CStr::UnescapeBackslashes() const
return NewString;
}
CStr CStr::EscapeToPrintableASCII() const
CStr8 CStr::EscapeToPrintableASCII() const
{
CStr NewString;
CStr8 NewString;
for (size_t i = 0; i < length(); i++)
{
tchar ch = (*this)[i];
if (ch == '"')
NewString += _T("\\\"");
else if (ch == '\\')
NewString += _T("\\\\");
else if (ch == '\n')
NewString += _T("\\n");
if (ch == '"') NewString += "\\\"";
else if (ch == '\\') NewString += "\\\\";
else if (ch == '\b') NewString += "\\b";
else if (ch == '\f') NewString += "\\f";
else if (ch == '\n') NewString += "\\n";
else if (ch == '\r') NewString += "\\r";
else if (ch == '\t') NewString += "\\t";
else if (ch >= 32 && ch <= 126)
NewString += ch;
else
{
std::tstringstream ss;
ss << _T("\\x") << std::hex << std::setfill(_T('0')) << std::setw(2) << (int)(unsigned char)ch;
std::stringstream ss;
ss << "\\u" << std::hex << std::setfill('0') << std::setw(4) << (int)(unsigned char)ch;
NewString += ss.str();
}
}

4
source/ps/CStr.h
View File

@ -311,9 +311,9 @@ public:
CStr UnescapeBackslashes() const;
/**
* Convert strings to printable ASCII characters with C-style escapes
* Convert strings to printable ASCII characters with JSON-style escapes.
*/
CStr EscapeToPrintableASCII() const;
CStr8 EscapeToPrintableASCII() const;
/**
* Return a trimmed copy of the CStr.