From e203f7c3ad6a95dfa6179e30904ce0432ea0de91 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 26 Sep 2013 19:58:33 +0200 Subject: util: properly handle the root dir in PATH_FOREACH_PREFIX Also add PATH_FOREACH_PREFIX_MORE which includes the specified dir itself in the iteration --- src/test/test-path-util.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) (limited to 'src/test/test-path-util.c') diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index e303e488e2..ed3b315a61 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -107,29 +107,55 @@ static void test_find_binary(void) { } static void test_prefixes(void) { - static const char* values[] = { "/a/b/c", "/a/b", "/a", "", NULL}; - unsigned i = 0; + static const char* values[] = { "/a/b/c/d", "/a/b/c", "/a/b", "/a", "", NULL}; + unsigned i; char s[PATH_MAX]; + bool b; - PATH_FOREACH_PREFIX(s, "/a/b/c/d") { + i = 0; + PATH_FOREACH_PREFIX_MORE(s, "/a/b/c/d") { log_error("---%s---", s); assert_se(streq(s, values[i++])); } + assert_se(values[i] == NULL); + i = 1; + PATH_FOREACH_PREFIX(s, "/a/b/c/d") { + log_error("---%s---", s); + assert_se(streq(s, values[i++])); + } assert_se(values[i] == NULL); i = 0; - PATH_FOREACH_PREFIX(s, "////a////b////c///d///////") + PATH_FOREACH_PREFIX_MORE(s, "////a////b////c///d///////") assert_se(streq(s, values[i++])); + assert_se(values[i] == NULL); + i = 1; + PATH_FOREACH_PREFIX(s, "////a////b////c///d///////") + assert_se(streq(s, values[i++])); assert_se(values[i] == NULL); PATH_FOREACH_PREFIX(s, "////") + assert_not_reached("Wut?"); + + b = false; + PATH_FOREACH_PREFIX_MORE(s, "////") { + assert_se(!b); assert_se(streq(s, "")); + b = true; + } + assert_se(b); PATH_FOREACH_PREFIX(s, "") assert_not_reached("wut?"); + b = false; + PATH_FOREACH_PREFIX_MORE(s, "") { + assert(!b); + assert(streq(s, "")); + b = true; + } } int main(void) { -- cgit v1.2.3-54-g00ecf