p
/
liberty
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

IRC: properly unescape message tags

This commit is contained in:
Přemysl Eric Janouch 2015-06-11 21:00:00 +02:00
parent 99b92fdd6e
commit 8a28bfa3d1
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
liberty-proto.c
View File

@ -32,6 +32,35 @@ struct irc_message
struct str_vector params; ///< Command parameters struct str_vector params; ///< Command parameters
}; };
static char *
irc_unescape_message_tag (const char *value)
{
struct str s;
str_init (&s);
bool escape = false;
for (const char *p = value; *p; p++)
{
if (escape)
{
switch (*p)
{
case ':': str_append_c (&s, ';'); break;
case 's': str_append_c (&s, ' '); break;
case 'r': str_append_c (&s, '\r'); break;
case 'n': str_append_c (&s, '\n'); break;
default: str_append_c (&s, *p);
}
escape = false;
}
else if (*p == '\\')
escape = true;
else
str_append_c (&s, *p);
}
return str_steal (&s);
}
static void static void
irc_parse_message_tags (const char *tags, struct str_map *out) irc_parse_message_tags (const char *tags, struct str_map *out)
{ {
@ -45,7 +74,7 @@ irc_parse_message_tags (const char *tags, struct str_map *out)
if (equal_sign) if (equal_sign)
{ {
*equal_sign = '\0'; *equal_sign = '\0';
str_map_set (out, key, xstrdup (equal_sign + 1)); str_map_set (out, key, irc_unescape_message_tag (equal_sign + 1));
} }
else else
str_map_set (out, key, xstrdup ("")); str_map_set (out, key, xstrdup (""));