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

path-util: add path_extend(), inspired by strextend(), but using path_join()

Browse Source
This commit is contained in:
Lennart Poettering
2021-05-27 16:02:18 +02:00
parent 38dd7673b3
commit 7ae2768028
3 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-path-util.c
+22
View File
@@ -380,6 +380,27 @@ static void test_path_join(void) {
test_join("//foo////bar////baz//", "//foo/", "///bar/", "///baz//");
}
static void test_path_extend(void) {
_cleanup_free_ char *p = NULL;
log_info("/* %s */", __func__);
assert_se(path_extend(&p, "foo", "bar", "baz") == p);
assert_se(streq(p, "foo/bar/baz"));
assert_se(path_extend(&p, "foo", "bar", "baz") == p);
assert_se(streq(p, "foo/bar/baz/foo/bar/baz"));
p = mfree(p);
assert_se(path_extend(&p, "foo") == p);
assert_se(streq(p, "foo"));
assert_se(path_extend(&p, "/foo") == p);
assert_se(streq(p, "foo/foo"));
assert_se(path_extend(&p, "waaaah/wahhh/") == p);
assert_se(streq(p, "foo/foo/waaaah/wahhh/"));
}
static void test_fsck_exists(void) {
log_info("/* %s */", __func__);
@@ -860,6 +881,7 @@ int main(int argc, char **argv) {
test_find_executable_exec();
test_prefixes();
test_path_join();
test_path_extend();
test_fsck_exists();
test_make_relative();
test_strv_resolve();