diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-11-10 23:44:34 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-11-10 23:45:12 +0100 |
| commit | f88e6be5ee31ff0e45fabcdedaf26d3be0d4817a (patch) | |
| tree | 6eaee98e65ef337eddc31ea60a47ae444c8e2a1d /src/test | |
| parent | 27e9c5af817147ea1c678769e45e83f2e4b4ae96 (diff) | |
strv: rework strv_split_quoted() to use unquote_first_word()
This should make the unquoting scheme a bit less naive.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test-strv.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/test/test-strv.c b/src/test/test-strv.c index 915fa4675f..180f062390 100644 --- a/src/test/test-strv.c +++ b/src/test/test-strv.c @@ -165,7 +165,7 @@ static void test_strv_quote_unquote(const char* const *split, const char *quoted assert_se(p); assert_se(streq(p, quoted)); - r = strv_split_quoted(&s, quoted); + r = strv_split_quoted(&s, quoted, false); assert_se(r == 0); assert_se(s); STRV_FOREACH(t, s) { @@ -182,7 +182,7 @@ static void test_strv_unquote(const char *quoted, const char **list) { char **t; int r; - r = strv_split_quoted(&s, quoted); + r = strv_split_quoted(&s, quoted, false); assert_se(r == 0); assert_se(s); j = strv_join(s, " | "); @@ -199,7 +199,7 @@ static void test_invalid_unquote(const char *quoted) { char **s = NULL; int r; - r = strv_split_quoted(&s, quoted); + r = strv_split_quoted(&s, quoted, false); assert_se(s == NULL); assert_se(r == -EINVAL); } @@ -482,12 +482,12 @@ int main(int argc, char *argv[]) { test_strv_unquote(" \"x'\" ", (const char*[]) { "x'", NULL }); test_strv_unquote("a '--b=c \"d e\"'", (const char*[]) { "a", "--b=c \"d e\"", NULL }); - test_invalid_unquote("a --b='c \"d e\"'"); - test_invalid_unquote("a --b='c \"d e\" '"); + test_invalid_unquote("a --b='c \"d e\"''"); + test_invalid_unquote("a --b='c \"d e\" '\""); test_invalid_unquote("a --b='c \"d e\"garbage"); test_invalid_unquote("'"); test_invalid_unquote("\""); - test_invalid_unquote("'x'y"); + test_invalid_unquote("'x'y'g"); test_strv_split(); test_strv_split_newlines(); |