kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eina: extend eina_str_escape to escape more common case. 

Summary: Added new symbols, that will be escaped. There are '\"', '\t' and '\n'.

Reviewers: raster, cedric

Reviewed By: cedric

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D2130

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
Mykyta Biliavskyi 2015-03-13 08:15:57 +01:00 committed by Cedric BAIL
parent 65d0c2a1e1
commit 37c58d4397
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lib/eina/eina_str.c
View File

@ -629,12 +629,32 @@ eina_str_escape(const char *str)
for (s = str, d = s2; *s != 0; s++, d++)
{
if ((*s == ' ') || (*s == '\\') || (*s == '\''))
{
switch (*s)
{
case ' ':
case '\\':
case '\'':
case '\"':
{
*d = '\\';
d++;
}
break;
}
case '\n':
{
*d = '\\'; d++;
*d = 'n'; d++;
s++;
break;
}
case '\t':
{
*d = '\\'; d++;
*d = 't'; d++;
s++;
break;
}
}
*d = *s;
}
*d = 0;

7
src/lib/eina/eina_str.h
View File

@ -293,9 +293,10 @@ EAPI char *eina_str_convert_len(const char *enc_from, const char *enc_
* @param str The string to escape.
* @return The escaped string.
*
* Escaping is done by adding a slash "\" before any occurrence of slashes "\",
* spaces " " or apostrophes "'". This function returns a newly allocated
* escaped string on success, @c NULL on failure. When not used anymore, the
* Escaping is done by adding a slash "\" before any occurrence of slashes "\"
* include '\n' and '\t', spaces " ", apostrophes "'" or quotes """. This
* function returns a newly allocated escaped string on success, @c NULL on
* failure. When not used anymore, the
* returned value must be freed.
*/
EAPI char *eina_str_escape(const char *str) EINA_WARN_UNUSED_RESULT EINA_MALLOC EINA_ARG_NONNULL(1);