@@ -677,147 +677,6 @@ static void handle_de(yystype *tokens, size_t start, const size_t cnt, const cha

 		res->pos_end++; /* ) */

 }

-/* --------- this should be in str.c -------------------------------- */

-static const int hex_chars[256] = {

-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,

-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,

-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,

-     0, 1, 2, 3,  4, 5, 6, 7,  8, 9,-1,-1, -1,-1,-1,-1,

-    -1,10,11,12, 13,14,15,-1, -1,-1,-1,-1, -1,-1,-1,-1,

-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,

-    -1,10,11,12, 13,14,15,-1, -1,-1,-1,-1, -1,-1,-1,-1,

-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,

-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,

-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,

-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,

-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,

-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,

-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,

-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,

-    -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,

-};

-

-static inline int cli_hex2int(const char c)

-{

-	return hex_chars[(const unsigned char)c];

-}

-

-static inline size_t output_utf8(uint16_t u, unsigned char* dst)

-{

-	if(!u) {

-		*dst = 0x1; /* don't add \0, add \1 instead */

-		return 1;

-	}

-	if(u < 0x80) {

-		*dst = u&0xff;

-		return 1;

-	}

-	if(u < 0x800) {

-		*dst++ = 0xc0 | (u>>6);   /* 110yyyyy */

-		*dst = 0x80 | (u & 0x3f); /* 10zzzzzz */

-		return 2;

-	}

-	/* u < 0x10000 because we only handle utf-16,

-	 * values in range 0xd800 - 0xdfff aren't valid, but we don't check for

-	 * that*/

-	*dst++ = 0xe0 | (u>>12);        /* 1110xxxx */

-	*dst++ = 0x80 | ((u>>6)&0x3f); /* 10yyyyyy */

-	*dst = 0x80 | (u & 0x3f);      /* 10zzzzzz */

-	return 3;

-}

-

-void cli_textbuffer_append_normalize(struct text_buffer *buf, const char *str, size_t len)

-{

-	size_t i;

-	for(i=0;i < len;i++) {

-		char c = str[i];

-		if (c == '\\' && i+1 < len) {

-			i++;

-			switch (str[i]) {

-				case '0':

-					c = 0;

-					break;

-				case 'b':

-					c = 8;

-					break;

-				case 't':

-					c = 9;

-					break;

-				case 'n':

-					c = 10;

-					break;

-				case 'v':

-					c = 11;

-					break;

-				case 'f':

-					c = 12;

-					break;

-				case 'r':

-					c=13;

-					break;

-				case 'x':

-					if(i+2 < len)

-						c = (cli_hex2int(str[i+1])<<4)|cli_hex2int(str[i+2]);

-					i += 2;

-					break;

-				case 'u':

-					if(i+4 < len) {

-						uint16_t u = (cli_hex2int(str[i+1])<<12) | (cli_hex2int(str[i+2])<<8) |

-							(cli_hex2int(str[i+3])<<4) | cli_hex2int(str[i+4]);

-						textbuffer_ensure_capacity(buf, 4);

-						buf->pos += output_utf8(u, (unsigned char*)buf->data);

-						i += 4;

-						continue;

-					}

-					break;

-				default:

-					c = str[i];

-					break;

-			}

-		}

-		if(!c) c = 1; /* we don't insert \0 */

-		textbuffer_putc(buf, c);

-	}

-}

-

-

-char *cli_unescape(const char *str)

-{

-	char *R;

-	size_t k, i=0;

-	const size_t len = strlen(str);

-	/* unescaped string is at most as long as original,

-	 * it will usually be shorter */

-	R = cli_malloc(len + 1);

-	if(!R)

-		return NULL;

-	for(k=0;k < len;k++) {

-		unsigned char c = str[k];

-		if (str[k] == '%') {

-			if(k+5 >= len || str[k+1] != 'u' || !isxdigit(str[k+2]) || !isxdigit(str[k+3])

-						|| !isxdigit(str[k+4]) || !isxdigit(str[k+5])) {

-				if(k+2 < len && isxdigit(str[k+1]) && isxdigit(str[k+2])) {

-					c = (cli_hex2int(str[k+1])<<4) | cli_hex2int(str[k+2]);

-					k += 2;

-				}

-			} else {

-				uint16_t u = (cli_hex2int(str[k+2])<<12) | (cli_hex2int(str[k+3])<<8) |

-					(cli_hex2int(str[k+4])<<4) | cli_hex2int(str[k+5]);

-				i += output_utf8(u, (unsigned char*)&R[i]);

-				k += 5;

-				continue;

-			}

-		}

-		if(!c) c = 1; /* don't add \0 */

-		R[i++] = c;

-	}

-	R[i++] = '\0';

-	R = cli_realloc2(R, i);

-	return R;

-}

-

-/* ------------ end of str.c ----------------- */

-

 static int handle_unescape(struct tokens *tokens, size_t start, const size_t cnt)

 {

 	if(tokens->data[start].type == TOK_StringLiteral) {

@@ -991,7 +850,6 @@ void cli_js_output(struct parser_state *state, const char *tempdir)

 	unsigned i;

 	struct buf buf;

 	char lastchar = '\0';

-	char *name;

 	char filename[1024];

 	snprintf(filename, 1024, "%s/javascript", tempdir);

@@ -1405,7 +1263,10 @@ static inline int parseString(YYSTYPE *lvalp, yyscan_t scanner, const char q,

 		}

 		break;

 	} while (1);

-	len = (end && end > start) ? end - start : scanner->insize - scanner->pos;

+	if(end && end > start)

+		len = end - start;

+	else

+		len = scanner->insize - scanner->pos;

 	cli_textbuffer_append_normalize(&scanner->buf, start, len);

 	if(end) {

 		/* skip over end quote */

@@ -19,23 +19,27 @@ static inline int textbuffer_ensure_capacity(struct text_buffer *txtbuf, size_t

 	return 0;

 }

-static inline void textbuffer_append_len(struct text_buffer *txtbuf, const char *s, size_t len)

+static inline int textbuffer_append_len(struct text_buffer *txtbuf, const char *s, size_t len)

 {

-	textbuffer_ensure_capacity(txtbuf, len);

+	if(textbuffer_ensure_capacity(txtbuf, len) == -1)

+		return -1;

 	memcpy(&txtbuf->data[txtbuf->pos], s, len);

 	txtbuf->pos += len;

+	return 0;

 }

-static inline void textbuffer_append(struct text_buffer *txtbuf, const char *s)

+static inline int textbuffer_append(struct text_buffer *txtbuf, const char *s)

 {

 	size_t len = strlen(s);

-	textbuffer_append_len(txtbuf, s, len);

+	return textbuffer_append_len(txtbuf, s, len);

 }

-static inline void textbuffer_putc(struct text_buffer *txtbuf, const char c)

+static inline int textbuffer_putc(struct text_buffer *txtbuf, const char c)

 {

-	textbuffer_ensure_capacity(txtbuf, 1);

+	if(textbuffer_ensure_capacity(txtbuf, 1) == -1)

+		return -1;

 	txtbuf->data[txtbuf->pos++] = c;

+	return 0;

 }

 #endif

@@ -34,6 +34,7 @@

 #include "others.h"

 #include "matcher.h"

 #include "cltypes.h"

+#include "jsparse/textbuf.h"

 static const int hex_chars[256] = {

     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,

@@ -448,3 +449,123 @@ int cli_isnumber(const char *str)

     return 1;

 }

+

+/* encodes the unicode character as utf-8 */

+static inline size_t output_utf8(uint16_t u, unsigned char* dst)

+{

+	if(!u) {

+		*dst = 0x1; /* don't add \0, add \1 instead */

+		return 1;

+	}

+	if(u < 0x80) {

+		*dst = u&0xff;

+		return 1;

+	}

+	if(u < 0x800) {

+		*dst++ = 0xc0 | (u>>6);   /* 110yyyyy */

+		*dst = 0x80 | (u & 0x3f); /* 10zzzzzz */

+		return 2;

+	}

+	/* u < 0x10000 because we only handle utf-16,

+	 * values in range 0xd800 - 0xdfff aren't valid, but we don't check for

+	 * that*/

+	*dst++ = 0xe0 | (u>>12);        /* 1110xxxx */

+	*dst++ = 0x80 | ((u>>6)&0x3f); /* 10yyyyyy */

+	*dst = 0x80 | (u & 0x3f);      /* 10zzzzzz */

+	return 3;

+}

+

+/* javascript-like unescape() function */

+char *cli_unescape(const char *str)

+{

+	char *R;

+	size_t k, i=0;

+	const size_t len = strlen(str);

+	/* unescaped string is at most as long as original,

+	 * it will usually be shorter */

+	R = cli_malloc(len + 1);

+	if(!R)

+		return NULL;

+	for(k=0;k < len;k++) {

+		unsigned char c = str[k];

+		if (str[k] == '%') {

+			if(k+5 >= len || str[k+1] != 'u' || !isxdigit(str[k+2]) || !isxdigit(str[k+3])

+						|| !isxdigit(str[k+4]) || !isxdigit(str[k+5])) {

+				if(k+2 < len && isxdigit(str[k+1]) && isxdigit(str[k+2])) {

+					c = (cli_hex2int(str[k+1])<<4) | cli_hex2int(str[k+2]);

+					k += 2;

+				}

+			} else {

+				uint16_t u = (cli_hex2int(str[k+2])<<12) | (cli_hex2int(str[k+3])<<8) |

+					(cli_hex2int(str[k+4])<<4) | cli_hex2int(str[k+5]);

+				i += output_utf8(u, (unsigned char*)&R[i]);

+				k += 5;

+				continue;

+			}

+		}

+		if(!c) c = 1; /* don't add \0 */

+		R[i++] = c;

+	}

+	R[i++] = '\0';

+	R = cli_realloc2(R, i);

+	return R;

+}

+

+/* handle javascript's escape sequences inside strings */

+int cli_textbuffer_append_normalize(struct text_buffer *buf, const char *str, size_t len)

+{

+	size_t i;

+	for(i=0;i < len;i++) {

+		char c = str[i];

+		if (c == '\\' && i+1 < len) {

+			i++;

+			switch (str[i]) {

+				case '0':

+					c = 0;

+					break;

+				case 'b':

+					c = 8;

+					break;

+				case 't':

+					c = 9;

+					break;

+				case 'n':

+					c = 10;

+					break;

+				case 'v':

+					c = 11;

+					break;

+				case 'f':

+					c = 12;

+					break;

+				case 'r':

+					c=13;

+					break;

+				case 'x':

+					if(i+2 < len)

+						c = (cli_hex2int(str[i+1])<<4)|cli_hex2int(str[i+2]);

+					i += 2;

+					break;

+				case 'u':

+					if(i+4 < len) {

+						uint16_t u = (cli_hex2int(str[i+1])<<12) | (cli_hex2int(str[i+2])<<8) |

+							(cli_hex2int(str[i+3])<<4) | cli_hex2int(str[i+4]);

+						if(textbuffer_ensure_capacity(buf, 4) == -1)

+							return -1;

+						buf->pos += output_utf8(u, (unsigned char*)&buf->data[buf->pos]);

+						i += 4;

+						continue;

+					}

+					break;

+				default:

+					c = str[i];

+					break;

+			}

+		}

+		if(!c) c = 1; /* we don't insert \0 */

+		if(textbuffer_putc(buf, c) == -1)

+			return -1;

+	}

+	return 0;

+}

+

@@ -44,4 +44,8 @@ const char *cli_memstr(const char *haystack, int hs, const char *needle, int ns)

 char *cli_strrcpy(char *dest, const char *source);

 void cli_strtokenize(char *buffer, const char delim, const size_t token_count, const char **tokens);

 int cli_isnumber(const char *str);

+char *cli_unescape(const char *str);

+struct text_buffer;

+int  cli_textbuffer_append_normalize(struct text_buffer *buf, const char *str, size_t len);

+

 #endif

@@ -1,5 +1,5 @@

 TESTS = check_clamav

 bin_PROGRAMS = check_clamav

-check_clamav_SOURCES = check_clamav.c check_jsnorm.c $(top_builddir)/libclamav/clamav.h

+check_clamav_SOURCES = check_clamav.c check_jsnorm.c check_str.c $(top_builddir)/libclamav/clamav.h

 check_clamav_CFLAGS = 

 check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @LCHECK@

@@ -50,7 +50,8 @@ am__installdirs = "$(DESTDIR)$(bindir)"

 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

 PROGRAMS = $(bin_PROGRAMS)

 am_check_clamav_OBJECTS = check_clamav-check_clamav.$(OBJEXT) \

-	check_clamav-check_jsnorm.$(OBJEXT)

+	check_clamav-check_jsnorm.$(OBJEXT) \

+	check_clamav-check_str.$(OBJEXT)

 check_clamav_OBJECTS = $(am_check_clamav_OBJECTS)

 check_clamav_DEPENDENCIES = $(top_builddir)/libclamav/libclamav.la

 check_clamav_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \

@@ -201,7 +202,7 @@ target_os = @target_os@

 target_vendor = @target_vendor@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

-check_clamav_SOURCES = check_clamav.c check_jsnorm.c $(top_builddir)/libclamav/clamav.h

+check_clamav_SOURCES = check_clamav.c check_jsnorm.c check_str.c $(top_builddir)/libclamav/clamav.h

 check_clamav_CFLAGS = 

 check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @LCHECK@

 all: all-am

@@ -277,6 +278,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_clamav.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_jsnorm.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clamav-check_str.Po@am__quote@

 .c.o:

 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

@@ -327,6 +329,20 @@ check_clamav-check_jsnorm.obj: check_jsnorm.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_jsnorm.obj `if test -f 'check_jsnorm.c'; then $(CYGPATH_W) 'check_jsnorm.c'; else $(CYGPATH_W) '$(srcdir)/check_jsnorm.c'; fi`

+check_clamav-check_str.o: check_str.c

+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -MT check_clamav-check_str.o -MD -MP -MF $(DEPDIR)/check_clamav-check_str.Tpo -c -o check_clamav-check_str.o `test -f 'check_str.c' || echo '$(srcdir)/'`check_str.c

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/check_clamav-check_str.Tpo $(DEPDIR)/check_clamav-check_str.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='check_str.c' object='check_clamav-check_str.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_str.o `test -f 'check_str.c' || echo '$(srcdir)/'`check_str.c

+

+check_clamav-check_str.obj: check_str.c

+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -MT check_clamav-check_str.obj -MD -MP -MF $(DEPDIR)/check_clamav-check_str.Tpo -c -o check_clamav-check_str.obj `if test -f 'check_str.c'; then $(CYGPATH_W) 'check_str.c'; else $(CYGPATH_W) '$(srcdir)/check_str.c'; fi`

+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/check_clamav-check_str.Tpo $(DEPDIR)/check_clamav-check_str.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='check_str.c' object='check_clamav-check_str.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_clamav_CFLAGS) $(CFLAGS) -c -o check_clamav-check_str.obj `if test -f 'check_str.c'; then $(CYGPATH_W) 'check_str.c'; else $(CYGPATH_W) '$(srcdir)/check_str.c'; fi`

+

 mostlyclean-libtool:

 	-rm -f *.lo

@@ -301,6 +301,7 @@ int main(int argc, char **argv)

     SRunner *sr = srunner_create(s);

     srunner_add_suite(sr, test_cli_suite());

     srunner_add_suite(sr, test_jsnorm_suite());

+    srunner_add_suite(sr, test_str_suite());

     srunner_set_log(sr, "test.log");

     srunner_run_all(sr, CK_NORMAL);

@@ -150,104 +150,12 @@ START_TEST (test_init_parse_destroy)

 }

 END_TEST

-static struct text_buffer buf;

-

-static void buf_setup(void)

-{

-	memset(&buf, 0, sizeof(buf));

-}

-

-static void buf_teardown(void)

-{

-	if(buf.data)

-		free(buf.data);

-	memset(&buf, 0, sizeof(buf));

-}

-

-START_TEST (test_append_len)

-{

-	textbuffer_append_len(&buf, "test",3);

-	fail_unless(buf.data && !strncmp(buf.data,"tes",3), "textbuffer_append_len");

-}

-END_TEST

-

-START_TEST (test_append)

-{

-	textbuffer_append(&buf, "test");

-	textbuffer_putc(&buf, '\0');

-	fail_unless(buf.data && !strcmp(buf.data,"test"), "textbuffer_append");

-}

-END_TEST

-

-START_TEST (test_putc)

-{

-	textbuffer_putc(&buf, '\x5a');

-	fail_unless(buf.data && buf.data[0] == '\x5a', "textbuffer_putc");

-}

-END_TEST

-

-START_TEST (test_unescape_simple)

-{

-	char *str = cli_unescape("");

-	fail_unless(str && strlen(str) == 0, "cli_unescape empty string");

-	free(str);

-

-	str = cli_unescape("1");

-	fail_unless(str && !strcmp(str,"1"), "cli_unescape one char");

-	free(str);

-

-	str = cli_unescape("tesT");

-	fail_unless(str && !strcmp(str,"tesT"), "cli_unescape simple string");

-	free(str);

-}

-END_TEST

-

-START_TEST (test_unescape_hex)

-{

-	char *str = cli_unescape("%5a");

-	fail_unless(str && !strcmp(str,"\x5a"), "cli_unescape hex");

-	free(str);

-

-	str = cli_unescape("%b5%8");

-	fail_unless(str && !strcmp(str,"\xb5%8"), "cli_unescape truncated");

-	free(str);

-

-	str = cli_unescape("%b5%");

-	fail_unless(str && !strcmp(str,"\xb5%"), "cli_unescape truncated/2");

-	free(str);

-

-	str = cli_unescape("%00");

-	fail_unless(str && !strcmp(str,"\x1"), "cli_unescape %00");

-	free(str);

-}

-END_TEST

-

-START_TEST (test_unescape_unicode)

-{

-	char *str = cli_unescape("%u05D0");

-	/* unicode is converted to utf-8 representation */

-	fail_unless(str && !strcmp(str,"\xd7\x90"), "cli_unescape unicode aleph");

-	free(str);

-

-	str = cli_unescape("%u00a2%u007f%u0080%u07ff%u0800%ue000");

-	fail_unless(str && !strcmp(str,"\xc2\xa2\x7f\xc2\x80\xdf\xbf\xe0\xa0\x80\xee\x80\x80"), 

-			"cli_unescape utf-8 test");

-	free(str);

-

-	str = cli_unescape("%%u123%u12%u1%u%u1234");

-	fail_unless(str && !strcmp(str,"%%u123%u12%u1%u\xe1\x88\xb4"),

-			"cli_unescape unicode truncated");

-

-	free(str);

-}

-END_TEST

 Suite *test_jsnorm_suite(void);

 Suite *test_jsnorm_suite(void)

 {

     Suite *s = suite_create("jsnorm");

-    TCase *tc_jsnorm_gperf, *tc_jsnorm_token, *tc_jsnorm_api, *tc_jsnorm_tbuf, *tc_cli_unescape, *tc_cli_textbuffer_append_normalize;

-

+    TCase *tc_jsnorm_gperf, *tc_jsnorm_token, *tc_jsnorm_api;

     tc_jsnorm_gperf = tcase_create("jsnorm gperf");

     suite_add_tcase (s, tc_jsnorm_gperf);

     tcase_add_loop_test(tc_jsnorm_gperf, test_keywords, 0, sizeof(kw_test)/sizeof(kw_test[0]));

@@ -266,23 +174,6 @@ Suite *test_jsnorm_suite(void)

     tcase_add_test(tc_jsnorm_api, test_init_destroy);

     tcase_add_test(tc_jsnorm_api, test_init_parse_destroy);

-    tc_jsnorm_tbuf = tcase_create("jsnorm textbuf functions");

-    suite_add_tcase (s, tc_jsnorm_tbuf);

-    tcase_add_checked_fixture (tc_jsnorm_tbuf, buf_setup, buf_teardown);

-    tcase_add_test(tc_jsnorm_tbuf, test_append_len);

-    tcase_add_test(tc_jsnorm_tbuf, test_append);

-    tcase_add_test(tc_jsnorm_tbuf, test_putc);

-

-    tc_cli_unescape = tcase_create("cli_unescape");

-    suite_add_tcase (s, tc_cli_unescape);

-    tcase_add_test(tc_cli_unescape, test_unescape_simple);

-    tcase_add_test(tc_cli_unescape, test_unescape_unicode);

-    tcase_add_test(tc_cli_unescape, test_unescape_hex);

-

-

-    tc_cli_textbuffer_append_normalize = tcase_create("cli_textbuffer_append_normalize");

-    suite_add_tcase (s, tc_cli_textbuffer_append_normalize);

-

     return s;

 }