March 2012 - tor-commits - lists.torproject.org

[tor/master] Add tests for escaped content in config
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 4d9dda9bb9129fa7996c077a2f98c65e6b123178 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Fri Feb 3 20:52:34 2012 +0100 Add tests for escaped content in config --- src/test/test_util.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 102 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 9866ab3..86c650e 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -297,6 +297,107 @@ test_util_config_line_quotes(void) tor_free(v); } +static void +test_util_config_line_escaped_content(void) +{ + char buf1[1024]; + char buf2[128]; + char buf3[128]; + char buf4[128]; + char *k=NULL, *v=NULL; + const char *str; + + /* Test parse_config_line_from_str */ + strlcpy(buf1, "HexadecimalLower \"\\x2a\"\n" + "HexadecimalUpper \"\\x2A\"\n" + "HexadecimalUpperX \"\\X2A\"\n" + "Octal \"\\52\"\n" + "Newline \"\\n\"\n" + "Tab \"\\t\"\n" + "CarriageReturn \"\\r\"\n" + "Quote \"\\\"\"\n" + "Backslash \"\\\\\"\n" + , sizeof(buf1)); + + strlcpy(buf2, "BrokenEscapedContent \"\\a\"\n" + , sizeof(buf2)); + + strlcpy(buf3, "BrokenEscapedContent \"\\x\"\n" + , sizeof(buf3)); + + strlcpy(buf4, "BrokenOctal \"\\8\"\n" + , sizeof(buf4)); + + str = buf1; + + str = parse_config_line_from_str(str, &k, &v); + test_streq(k, "HexadecimalLower"); + test_streq(v, "*"); + tor_free(k); tor_free(v); + + str = parse_config_line_from_str(str, &k, &v); + test_streq(k, "HexadecimalUpper"); + test_streq(v, "*"); + tor_free(k); tor_free(v); + + str = parse_config_line_from_str(str, &k, &v); + test_streq(k, "HexadecimalUpperX"); + test_streq(v, "*"); + tor_free(k); tor_free(v); + + str = parse_config_line_from_str(str, &k, &v); + test_streq(k, "Octal"); + test_streq(v, "*"); + tor_free(k); tor_free(v); + + str = parse_config_line_from_str(str, &k, &v); + test_streq(k, "Newline"); + test_streq(v, "\n"); + tor_free(k); tor_free(v); + + str = parse_config_line_from_str(str, &k, &v); + test_streq(k, "Tab"); + test_streq(v, "\t"); + tor_free(k); tor_free(v); + + str = parse_config_line_from_str(str, &k, &v); + test_streq(k, "CarriageReturn"); + test_streq(v, "\r"); + tor_free(k); tor_free(v); + + str = parse_config_line_from_str(str, &k, &v); + test_streq(k, "Quote"); + test_streq(v, "\""); + tor_free(k); tor_free(v); + + str = parse_config_line_from_str(str, &k, &v); + test_streq(k, "Backslash"); + test_streq(v, "\\"); + tor_free(k); tor_free(v); + + str = buf2; + + str = parse_config_line_from_str(str, &k, &v); + test_eq_ptr(str, NULL); + tor_free(k); tor_free(v); + + str = buf3; + + str = parse_config_line_from_str(str, &k, &v); + test_eq_ptr(str, NULL); + tor_free(k); tor_free(v); + + str = buf4; + + str = parse_config_line_from_str(str, &k, &v); + test_eq_ptr(str, NULL); + tor_free(k); tor_free(v); + + done: + tor_free(k); + tor_free(v); +} + /** Test basic string functionality. */ static void test_util_strmisc(void) @@ -2160,6 +2261,7 @@ struct testcase_t util_tests[] = { UTIL_LEGACY(time), UTIL_LEGACY(config_line), UTIL_LEGACY(config_line_quotes), + UTIL_LEGACY(config_line_escaped_content), UTIL_LEGACY(strmisc), UTIL_LEGACY(pow2), UTIL_LEGACY(gzip),

1 0

[tor/master] Fix typo in config parser documentation
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit a753ef8517e02e33cec064394a25e29ea89e6145 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Fri Feb 3 21:05:58 2012 +0100 Fix typo in config parser documentation --- src/common/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index ecf49a6..f35a796 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2445,7 +2445,7 @@ parse_config_line_from_str(const char *line, char **key_out, char **value_out) KEYCHAR = Any character except ' ', '\r', '\n', '\t', '#', "\" VALUES = QUOTEDVALUE | NORMALVALUE - QUOTEDVALUE = QUOTE QVITEM* QUOTE EOLSPACE? + QUOTEDVALUE = QUOTE QVCHAR* QUOTE EOLSPACE? QUOTE = '"' QVCHAR = KEYCHAR | ESC ('n' | 't' | 'r' | '"' | ESC |'\'' | OCTAL | HEX) ESC = "\\"

1 0

[tor/master] Remove duplicated macro definition
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 5a206dbb7af3ff70880325d8975f49dd550e62ec Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Fri Feb 3 23:36:09 2012 +0100 Remove duplicated macro definition --- src/test/test.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/test/test.h b/src/test/test.h index 1aa59f1..4d5117a 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -34,7 +34,6 @@ #define test_neq_ptr(expr1, expr2) tt_ptr_op((expr1), !=, (expr2)) #define test_streq(expr1, expr2) tt_str_op((expr1), ==, (expr2)) #define test_strneq(expr1, expr2) tt_str_op((expr1), !=, (expr2)) -#define test_streq(expr1, expr2) tt_str_op((expr1), ==, (expr2)) #define test_mem_op(expr1, op, expr2, len) \ tt_assert_test_fmt_type(expr1,expr2,#expr1" "#op" "#expr2, \

1 0

[tor/master] Add test for broken hex parsing
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit f9ad35c361b4c183a55dec3f9fa7eb728e089730 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Fri Feb 3 23:28:40 2012 +0100 Add test for broken hex parsing * The test currently fails, but it's commented out (with an "#if 0") * As a broken octal actually gives a parse error, it seems fair that this fails, too --- src/test/test_util.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index b8c0544..4bcd49f 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -304,6 +304,7 @@ test_util_config_line_escaped_content(void) char buf2[128]; char buf3[128]; char buf4[128]; + char buf5[128]; char *k=NULL, *v=NULL; const char *str; @@ -330,6 +331,9 @@ test_util_config_line_escaped_content(void) strlcpy(buf4, "BrokenOctal \"\\8\"\n" , sizeof(buf4)); + strlcpy(buf5, "BrokenHex \"\\xg4\"\n" + , sizeof(buf5)); + str = buf1; str = parse_config_line_from_str(str, &k, &v); @@ -405,6 +409,14 @@ test_util_config_line_escaped_content(void) test_eq_ptr(str, NULL); tor_free(k); tor_free(v); +#if 0 + str = buf5; + + str = parse_config_line_from_str(str, &k, &v); + test_eq_ptr(str, NULL); + tor_free(k); tor_free(v); +#endif + done: tor_free(k); tor_free(v);

1 0

[tor/master] Add test for comments in the config parser
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit f81af6d7917249fcce8d463b228dc9244bbb56de Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Fri Feb 3 23:43:29 2012 +0100 Add test for comments in the config parser --- src/test/test_util.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 4bcd49f..6a77b17 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -298,6 +298,44 @@ test_util_config_line_quotes(void) } static void +test_util_config_line_comment_character(void) +{ + char buf[1024]; + char *k=NULL, *v=NULL; + const char *str; + + /* Test parse_config_line_from_str */ + strlcpy(buf, "k1 \"# in quotes\"\n" + "k2 some value # some comment\n" + "k3 /home/user/myTorNetwork#2\n" /* Testcase for #1323 */ + , sizeof(buf)); + str = buf; + + str = parse_config_line_from_str(str, &k, &v); + test_streq(k, "k1"); + test_streq(v, "# in quotes"); + tor_free(k); tor_free(v); + + str = parse_config_line_from_str(str, &k, &v); + test_streq(k, "k2"); + test_streq(v, "some value"); + tor_free(k); tor_free(v); + +#if 0 + str = parse_config_line_from_str(str, &k, &v); + test_streq(k, "k3"); + test_streq(v, "/home/user/myTorNetwork#2"); + tor_free(k); tor_free(v); + + test_streq(str, ""); +#endif + + done: + tor_free(k); + tor_free(v); +} + +static void test_util_config_line_escaped_content(void) { char buf1[1024]; @@ -2285,6 +2323,7 @@ struct testcase_t util_tests[] = { UTIL_LEGACY(time), UTIL_LEGACY(config_line), UTIL_LEGACY(config_line_quotes), + UTIL_LEGACY(config_line_comment_character), UTIL_LEGACY(config_line_escaped_content), UTIL_LEGACY(strmisc), UTIL_LEGACY(pow2),

1 0

[tor/master] Organize test_util_time in blocks
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit ab39382cf8297229f94171da1e38af6d26400231 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Sat Feb 4 12:47:58 2012 +0100 Organize test_util_time in blocks * Separate the tests for different functions with a comment * Move some test init code further down, closer to where it was actually being used --- src/test/test_util.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 6a77b17..ca82fbe 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -24,6 +24,8 @@ test_util_time(void) int i; struct timeval tv; + /* tv_udiff tests */ + start.tv_sec = 5; start.tv_usec = 5000; @@ -48,9 +50,8 @@ test_util_time(void) test_eq(-1005000L, tv_udiff(&start, &end)); - end.tv_usec = 999990; - start.tv_sec = 1; - start.tv_usec = 500; + + /* tor_timegm tests */ /* The test values here are confirmed to be correct on a platform * with a working timegm. */ @@ -67,6 +68,9 @@ test_util_time(void) a_time.tm_mday = 10; test_eq((time_t) 1076393695UL, tor_timegm(&a_time)); + + /* {format,parse}_rfc1123_time tests */ + format_rfc1123_time(timestr, 0); test_streq("Thu, 01 Jan 1970 00:00:00 GMT", timestr); format_rfc1123_time(timestr, (time_t)1091580502UL); @@ -78,13 +82,23 @@ test_util_time(void) test_eq(t_res, (time_t)1091580502UL); test_eq(-1, parse_rfc1123_time("Wed, zz Aug 2004 99-99x99 GMT", &t_res)); + + /* tor_gettimeofday tests */ + + end.tv_sec = 4; + end.tv_usec = 999990; + start.tv_sec = 1; + start.tv_usec = 500; + tor_gettimeofday(&start); /* now make sure time works. */ tor_gettimeofday(&end); /* We might've timewarped a little. */ tt_int_op(tv_udiff(&start, &end), >=, -5000); - /* Now let's check some format_iso_time variants */ + + /* format_iso_time tests */ + tv.tv_sec = (time_t)1326296338; tv.tv_usec = 3060; format_iso_time(timestr, tv.tv_sec);

1 0

[tor/master] Trivial cosmetic fix in test comments
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 73d9868232b2376a8cd053a50270acbafb27d2c2 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Sun Feb 5 01:21:33 2012 +0100 Trivial cosmetic fix in test comments --- src/test/test_util.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index ca82fbe..61bcbfb 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -24,7 +24,7 @@ test_util_time(void) int i; struct timeval tv; - /* tv_udiff tests */ + /* Test tv_udiff */ start.tv_sec = 5; start.tv_usec = 5000; @@ -51,7 +51,7 @@ test_util_time(void) test_eq(-1005000L, tv_udiff(&start, &end)); - /* tor_timegm tests */ + /* Test tor_timegm */ /* The test values here are confirmed to be correct on a platform * with a working timegm. */ @@ -69,7 +69,7 @@ test_util_time(void) test_eq((time_t) 1076393695UL, tor_timegm(&a_time)); - /* {format,parse}_rfc1123_time tests */ + /* Test {format,parse}_rfc1123_time */ format_rfc1123_time(timestr, 0); test_streq("Thu, 01 Jan 1970 00:00:00 GMT", timestr); @@ -83,7 +83,7 @@ test_util_time(void) test_eq(-1, parse_rfc1123_time("Wed, zz Aug 2004 99-99x99 GMT", &t_res)); - /* tor_gettimeofday tests */ + /* Test tor_gettimeofday */ end.tv_sec = 4; end.tv_usec = 999990; @@ -97,7 +97,7 @@ test_util_time(void) tt_int_op(tv_udiff(&start, &end), >=, -5000); - /* format_iso_time tests */ + /* Test format_iso_time */ tv.tv_sec = (time_t)1326296338; tv.tv_usec = 3060;

1 0

[tor/master] Add more/better tests in test_util_strmisc
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit f11be5786032d4d6a1b11e80572b5926c5228406 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Sun Feb 5 01:22:29 2012 +0100 Add more/better tests in test_util_strmisc --- src/test/test_util.c | 91 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 74 insertions(+), 17 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 61bcbfb..13cb2b8 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -482,8 +482,14 @@ test_util_strmisc(void) int i; char *cp; - /* Tests for corner cases of strl operations */ + /* Test strl operations */ test_eq(5, strlcpy(buf, "Hello", 0)); + test_eq(5, strlcpy(buf, "Hello", 10)); + test_streq(buf, "Hello"); + test_eq(5, strlcpy(buf, "Hello", 6)); + test_streq(buf, "Hello"); + test_eq(5, strlcpy(buf, "Hello", 5)); + test_streq(buf, "Hell"); strlcpy(buf, "Hello", sizeof(buf)); test_eq(10, strlcat(buf, "Hello", 5)); @@ -494,44 +500,95 @@ test_util_strmisc(void) strlcpy(buf, "!Testing 1 2 3?", sizeof(buf)); tor_strstrip(buf, "!? "); test_streq(buf, "Testing123"); + strlcpy(buf, "!!!Testing 1 2 3??", sizeof(buf)); + tor_strstrip(buf, "!? "); + test_streq(buf, "Testing123"); - /* Test tor_parse_long. */ - test_eq(10L, tor_parse_long("10",10,0,100,NULL,NULL)); - test_eq(0L, tor_parse_long("10",10,50,100,NULL,NULL)); - test_eq(-50L, tor_parse_long("-50",10,-100,100,NULL,NULL)); + /* Test tor_parse_long */ + /* Empty/zero input */ + test_eq(0L, tor_parse_long("",10,0,100,&i,NULL)); + test_eq(0, i); + test_eq(0L, tor_parse_long("0",10,0,100,&i,NULL)); + test_eq(1, i); + /* Normal cases */ + test_eq(10L, tor_parse_long("10",10,0,100,&i,NULL)); + test_eq(1, i); + test_eq(10L, tor_parse_long("10",10,0,10,&i,NULL)); + test_eq(1, i); + test_eq(10L, tor_parse_long("10",10,10,100,&i,NULL)); + test_eq(1, i); + test_eq(-50L, tor_parse_long("-50",10,-100,100,&i,NULL)); + test_eq(1, i); + test_eq(-50L, tor_parse_long("-50",10,-100,0,&i,NULL)); + test_eq(1, i); + test_eq(-50L, tor_parse_long("-50",10,-50,0,&i,NULL)); + test_eq(1, i); + /* Extra garbage */ + test_eq(0L, tor_parse_long("10m",10,0,100,&i,NULL)); + test_eq(0, i); + test_eq(0L, tor_parse_long("-50 plus garbage",10,-100,100,&i,NULL)); + test_eq(0, i); + test_eq(10L, tor_parse_long("10m",10,0,100,&i,&cp)); + test_eq(1, i); + test_streq(cp, "m"); + test_eq(-50L, tor_parse_long("-50 plus garbage",10,-100,100,&i,&cp)); + test_eq(1, i); + test_streq(cp, " plus garbage"); + /* Out of bounds */ + test_eq(0L, tor_parse_long("10",10,50,100,&i,NULL)); + test_eq(0, i); + test_eq(0L, tor_parse_long("-50",10,0,100,&i,NULL)); + test_eq(0, i); + /* Base different than 10 */ + test_eq(2L, tor_parse_long("10",2,0,100,NULL,NULL)); + test_eq(0L, tor_parse_long("2",2,0,100,NULL,NULL)); + test_eq(0L, tor_parse_long("10",-2,0,100,NULL,NULL)); + test_eq(68284L, tor_parse_long("10abc",16,0,70000,NULL,NULL)); + test_eq(68284L, tor_parse_long("10ABC",16,0,70000,NULL,NULL)); /* Test tor_parse_ulong */ + test_eq(0UL, tor_parse_ulong("",10,0,100,NULL,NULL)); + test_eq(0UL, tor_parse_ulong("0",10,0,100,NULL,NULL)); test_eq(10UL, tor_parse_ulong("10",10,0,100,NULL,NULL)); test_eq(0UL, tor_parse_ulong("10",10,50,100,NULL,NULL)); + test_eq(10UL, tor_parse_ulong("10",10,0,10,NULL,NULL)); + test_eq(10UL, tor_parse_ulong("10",10,10,100,NULL,NULL)); + test_eq(0UL, tor_parse_ulong("8",8,0,100,NULL,NULL)); + test_eq(50UL, tor_parse_ulong("50",10,50,100,NULL,NULL)); + test_eq(0UL, tor_parse_ulong("-50",10,-100,100,NULL,NULL)); - /* Test tor_parse_uint64. */ + /* Test tor_parse_uint64 */ test_assert(U64_LITERAL(10) == tor_parse_uint64("10 x",10,0,100, &i, &cp)); - test_assert(i == 1); + test_eq(1, i); test_streq(cp, " x"); test_assert(U64_LITERAL(12345678901) == tor_parse_uint64("12345678901",10,0,UINT64_MAX, &i, &cp)); - test_assert(i == 1); + test_eq(1, i); test_streq(cp, ""); test_assert(U64_LITERAL(0) == tor_parse_uint64("12345678901",10,500,INT32_MAX, &i, &cp)); - test_assert(i == 0); + test_eq(0, i); { - /* Test tor_parse_double. */ + /* Test tor_parse_double */ double d = tor_parse_double("10", 0, UINT64_MAX,&i,NULL); - test_assert(i == 1); + test_eq(1, i); test_assert(DBL_TO_U64(d) == 10); d = tor_parse_double("0", 0, UINT64_MAX,&i,NULL); - test_assert(i == 1); + test_eq(1, i); test_assert(DBL_TO_U64(d) == 0); d = tor_parse_double(" ", 0, UINT64_MAX,&i,NULL); - test_assert(i == 0); + test_eq(0, i); d = tor_parse_double(".0a", 0, UINT64_MAX,&i,NULL); - test_assert(i == 0); + test_eq(0, i); d = tor_parse_double(".0a", 0, UINT64_MAX,&i,&cp); - test_assert(i == 1); + test_eq(1, i); d = tor_parse_double("-.0", 0, UINT64_MAX,&i,NULL); - test_assert(i == 1); + test_eq(1, i); + test_assert(DBL_TO_U64(d) == 0); + d = tor_parse_double("-10", -100.0, 100.0,&i,NULL); + test_eq(1, i); + test_eq(-10.0, d); } /* Test failing snprintf cases */ @@ -543,7 +600,7 @@ test_util_strmisc(void) U64_PRINTF_ARG(U64_LITERAL(12345678901))); test_streq(buf, "x!12345678901!x"); - /* Test for strcmpstart and strcmpend. */ + /* Test for strcmpstart and strcmpend */ test_assert(strcmpstart("abcdef", "abcdef")==0); test_assert(strcmpstart("abcdef", "abc")==0); test_assert(strcmpstart("abcdef", "abd")<0);

1 0

[tor/master] Improve tor_snprintf tests
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 14177f03a944da7d2a542ea8e66d040315c8fc14 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Sun Feb 5 17:53:01 2012 +0100 Improve tor_snprintf tests --- src/test/test_util.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index f5f2038..2a315cb 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -591,14 +591,21 @@ test_util_strmisc(void) test_eq(-10.0, d); } - /* Test failing snprintf cases */ + /* Test tor_snprintf */ + /* Returning -1 when there's not enough room in the output buffer */ test_eq(-1, tor_snprintf(buf, 0, "Foo")); test_eq(-1, tor_snprintf(buf, 2, "Foo")); - - /* Test printf with uint64 */ + test_eq(-1, tor_snprintf(buf, 3, "Foo")); + test_neq(-1, tor_snprintf(buf, 4, "Foo")); + /* Always NUL-terminate the output */ + tor_snprintf(buf, 5, "abcdef"); + test_eq(0, buf[4]); + tor_snprintf(buf, 10, "abcdef"); + test_eq(0, buf[6]); + /* uint64 */ tor_snprintf(buf, sizeof(buf), "x!"U64_FORMAT"!x", U64_PRINTF_ARG(U64_LITERAL(12345678901))); - test_streq(buf, "x!12345678901!x"); + test_streq("x!12345678901!x", buf); /* Test str{,case}cmpstart */ test_assert(strcmpstart("abcdef", "abcdef")==0);

1 0

[tor/master] Add/improve tests for str{, case}cmp{start, end}
by nickm＠torproject.org 09 Mar '12

09 Mar '12

commit 314c851bc2ffacfe95d56a8d73c261b851f6a228 Author: Esteban Manchado Velázquez <emanchado(a)demiurgo.org> Date: Sun Feb 5 17:52:26 2012 +0100 Add/improve tests for str{,case}cmp{start,end} --- src/test/test_util.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 13cb2b8..f5f2038 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -600,24 +600,33 @@ test_util_strmisc(void) U64_PRINTF_ARG(U64_LITERAL(12345678901))); test_streq(buf, "x!12345678901!x"); - /* Test for strcmpstart and strcmpend */ + /* Test str{,case}cmpstart */ test_assert(strcmpstart("abcdef", "abcdef")==0); test_assert(strcmpstart("abcdef", "abc")==0); test_assert(strcmpstart("abcdef", "abd")<0); test_assert(strcmpstart("abcdef", "abb")>0); test_assert(strcmpstart("ab", "abb")<0); - + test_assert(strcmpstart("ab", "")==0); + test_assert(strcmpstart("ab", "ab ")<0); + test_assert(strcasecmpstart("abcdef", "abCdEF")==0); + test_assert(strcasecmpstart("abcDeF", "abc")==0); + test_assert(strcasecmpstart("abcdef", "Abd")<0); + test_assert(strcasecmpstart("Abcdef", "abb")>0); + test_assert(strcasecmpstart("ab", "Abb")<0); + test_assert(strcasecmpstart("ab", "")==0); + test_assert(strcasecmpstart("ab", "ab ")<0); + + /* Test str{,case}cmpend */ test_assert(strcmpend("abcdef", "abcdef")==0); test_assert(strcmpend("abcdef", "def")==0); test_assert(strcmpend("abcdef", "deg")<0); test_assert(strcmpend("abcdef", "dee")>0); - test_assert(strcmpend("ab", "abb")<0); - + test_assert(strcmpend("ab", "aab")>0); test_assert(strcasecmpend("AbcDEF", "abcdef")==0); test_assert(strcasecmpend("abcdef", "dEF")==0); - test_assert(strcasecmpend("abcDEf", "deg")<0); - test_assert(strcasecmpend("abcdef", "DEE")>0); - test_assert(strcasecmpend("ab", "abB")<0); + test_assert(strcasecmpend("abcdef", "Deg")<0); + test_assert(strcasecmpend("abcDef", "dee")>0); + test_assert(strcasecmpend("AB", "abb")<0); /* Test mem_is_zero */ memset(buf,0,128);

1 0