SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: fix handling of trailing whitespace in split_quoted()

Browse Source 
Inspired by a patch by Lukas Nykryn.
This commit is contained in:
Lennart Poettering
2013-11-28 18:42:18 +01:00
parent fb1454005d
commit 70f75a523b
2 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-strv.c
+27
View File
@@ -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();