From 70f75a523b16ad495a7791d595ee3eececf75953 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 27 Nov 2013 22:37:52 +0100 Subject: util: fix handling of trailing whitespace in split_quoted() Inspired by a patch by Lukas Nykryn. --- src/test/test-strv.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'src/test') diff --git a/src/test/test-strv.c b/src/test/test-strv.c index e46885902b..068e421097 100644 --- a/src/test/test-strv.c +++ b/src/test/test-strv.c @@ -143,6 +143,7 @@ static void test_strv_quote_unquote(const char* const *split, const char *quoted char **t; p = strv_join_quoted((char **)split); + assert_se(p); printf("-%s- --- -%s-\n", p, quoted); /* fprintf deals with NULL, puts does not */ assert_se(p); assert_se(streq(p, quoted)); @@ -156,6 +157,20 @@ static void test_strv_quote_unquote(const char* const *split, const char *quoted } } +static void test_strv_quote_unquote2(const char *quoted, const char ** list) { + _cleanup_strv_free_ char **s; + unsigned i = 0; + char **t; + + s = strv_split_quoted(quoted); + assert_se(s); + + STRV_FOREACH(t, s) + assert_se(streq(list[i++], *t)); + + assert_se(list[i] == NULL); +} + static void test_strv_split(void) { char **s; unsigned i = 0; @@ -405,6 +420,18 @@ int main(int argc, char *argv[]) { test_strv_quote_unquote(input_table_quotes, QUOTES_STRING); test_strv_quote_unquote(input_table_spaces, SPACES_STRING); + test_strv_quote_unquote2(" foo=bar \"waldo\" zzz ", (const char*[]) { "foo=bar", "waldo", "zzz", NULL }); + test_strv_quote_unquote2("", (const char*[]) { NULL }); + test_strv_quote_unquote2(" ", (const char*[]) { NULL }); + test_strv_quote_unquote2(" ", (const char*[]) { NULL }); + test_strv_quote_unquote2(" x", (const char*[]) { "x", NULL }); + test_strv_quote_unquote2("x ", (const char*[]) { "x", NULL }); + test_strv_quote_unquote2(" x ", (const char*[]) { "x", NULL }); + test_strv_quote_unquote2(" \"x\" ", (const char*[]) { "x", NULL }); + test_strv_quote_unquote2(" \'x\' ", (const char*[]) { "x", NULL }); + test_strv_quote_unquote2(" \'x\"\' ", (const char*[]) { "x\"", NULL }); + test_strv_quote_unquote2(" \"x\'\" ", (const char*[]) { "x\'", NULL }); + test_strv_split(); test_strv_split_newlines(); test_strv_split_nulstr(); -- cgit v1.2.3-54-g00ecf