diff options
| -rw-r--r-- | src/shared/util.c | 8 | ||||
| -rw-r--r-- | src/test/test-strv.c | 4 | ||||
| -rw-r--r-- | src/test/test-util.c | 49 |
3 files changed, 41 insertions, 20 deletions
diff --git a/src/shared/util.c b/src/shared/util.c index 364f61885b..91cf6705ea 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -521,7 +521,7 @@ int safe_atod(const char *s, double *ret_d) { static size_t strcspn_escaped(const char *s, const char *reject) { bool escaped = false; - size_t n; + int n; for (n=0; s[n]; n++) { if (escaped) @@ -531,6 +531,7 @@ static size_t strcspn_escaped(const char *s, const char *reject) { else if (strchr(reject, s[n])) break; } + /* if s ends in \, return index of previous char */ return n - escaped; } @@ -566,6 +567,11 @@ const char* split(const char **state, size_t *l, const char *separator, bool quo *state = current++ + *l + 2; } else if (quoted) { *l = strcspn_escaped(current, separator); + if (current[*l] && !strchr(separator, current[*l])) { + /* unfinished escape */ + *state = current; + return NULL; + } *state = current + *l; } else { *l = strcspn(current, separator); diff --git a/src/test/test-strv.c b/src/test/test-strv.c index 0b78086ea9..f343eab7c6 100644 --- a/src/test/test-strv.c +++ b/src/test/test-strv.c @@ -520,6 +520,10 @@ int main(int argc, char *argv[]) { test_strv_unquote(" \"x'\" ", STRV_MAKE("x'")); test_strv_unquote("a '--b=c \"d e\"'", STRV_MAKE("a", "--b=c \"d e\"")); + /* trailing backslashes */ + test_strv_unquote(" x\\\\", STRV_MAKE("x\\")); + test_invalid_unquote(" x\\"); + 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"); diff --git a/src/test/test-util.c b/src/test/test-util.c index bbf7512839..222af9a73a 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -406,28 +406,12 @@ static void test_foreach_word(void) { assert_se(strneq(expected[i++], word, l)); } -static void test_foreach_word_quoted(void) { +static void check(const char *test, char** expected, bool trailing) { const char *word, *state; size_t l; int i = 0; - const char test[] = "test a b c 'd' e '' '' hhh '' '' \"a b c\""; - const char * const expected[] = { - "test", - "a", - "b", - "c", - "d", - "e", - "", - "", - "hhh", - "", - "", - "a b c", - NULL - }; - printf("<%s>\n", test); + printf("<<<%s>>>\n", test); FOREACH_WORD_QUOTED(word, l, test, state) { _cleanup_free_ char *t = NULL; @@ -435,7 +419,34 @@ static void test_foreach_word_quoted(void) { assert_se(strneq(expected[i++], word, l)); printf("<%s>\n", t); } - assert_se(isempty(state)); + printf("<<<%s>>>\n", state); + assert(expected[i] == NULL); + assert_se(isempty(state) == !trailing); +} + +static void test_foreach_word_quoted(void) { + check("test a b c 'd' e '' '' hhh '' '' \"a b c\"", + STRV_MAKE("test", + "a", + "b", + "c", + "d", + "e", + "", + "", + "hhh", + "", + "", + "a b c"), + false); + + check("test \"xxx", + STRV_MAKE("test"), + true); + + check("test\\", + STRV_MAKE_EMPTY, + true); } static void test_default_term_for_tty(void) { |