mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-23 17:34:00 +03:00
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
This commit is contained in:
parent
baa89da40a
commit
e203f7c3ad
@ -52,5 +52,12 @@ int path_is_os_tree(const char *path);
|
||||
|
||||
int find_binary(const char *name, char **filename);
|
||||
|
||||
/* Iterates through the path prefixes of the specified path, going up
|
||||
* the tree, to root. Also returns "" (and not "/"!) for the root
|
||||
* directory. Excludes the specified directory itself */
|
||||
#define PATH_FOREACH_PREFIX(prefix, path) \
|
||||
for (char *_slash = strrchr(path_kill_slashes(strcpy(prefix, path)), '/'); _slash && !(*_slash = 0); _slash = strrchr((prefix), '/'))
|
||||
for (char *_slash = ({ path_kill_slashes(strcpy(prefix, path)); streq(prefix, "/") ? NULL : strrchr(prefix, '/'); }); _slash && !(*_slash = 0); _slash = strrchr((prefix), '/'))
|
||||
|
||||
/* Same as PATH_FOREACH_PREFIX but also includes the specified path itself */
|
||||
#define PATH_FOREACH_PREFIX_MORE(prefix, path) \
|
||||
for (char *_slash = ({ path_kill_slashes(strcpy(prefix, path)); if (streq(prefix, "/")) prefix[0] = 0; strrchr(prefix, 0); }); _slash && !(*_slash = 0); _slash = strrchr((prefix), '/'))
|
||||
|
@ -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;
|
||||
|
||||
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_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) {
|
||||
|
Loading…
Reference in New Issue
Block a user