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

Revert "conf-files: introduce CONF_FILES_CHASE_BASENAME flag"

Browse Source 
This reverts commit 49653adef3.

The commit was merged without review, and has several issues.
Let's revert the change now, and address the issue pointed out by
the commit later in another way.
This commit is contained in:
Yu Watanabe
2025-06-29 10:15:56 +09:00
parent c43223ff9f
commit 07c2fadbed
3 changed files with 2 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/conf-files.c
-3
View File
@@ -164,9 +164,6 @@ static int files_add(
if (!n)
return log_oom_debug();
if (FLAGS_SET(flags, CONF_FILES_CHASE_BASENAME))
free_and_replace(p, resolved_path);
r = hashmap_ensure_put(files, &string_hash_ops_free_free, n, p);
if (r < 0) {
assert(r == -ENOMEM);
src/basic/conf-files.h
+2 -3
View File
@@ -8,9 +8,8 @@ typedef enum ConfFilesFlags {
CONF_FILES_REGULAR = 1 << 1,
CONF_FILES_DIRECTORY = 1 << 2,
CONF_FILES_BASENAME = 1 << 3,
CONF_FILES_CHASE_BASENAME = 1 << 4, /* If set, also resolve symlink files in config directories. */
CONF_FILES_FILTER_MASKED_BY_SYMLINK = 1 << 5,
CONF_FILES_FILTER_MASKED_BY_EMPTY = 1 << 6,
CONF_FILES_FILTER_MASKED_BY_SYMLINK = 1 << 4,
CONF_FILES_FILTER_MASKED_BY_EMPTY = 1 << 5,
CONF_FILES_FILTER_MASKED = CONF_FILES_FILTER_MASKED_BY_SYMLINK | CONF_FILES_FILTER_MASKED_BY_EMPTY,
} ConfFilesFlags;
src/test/test-conf-files.c
-32
View File
@@ -185,14 +185,6 @@ TEST(conf_files_list) {
strjoina(search3, "relative-non-empty.conf"))));
result = strv_free(result);
ASSERT_OK(conf_files_list(&result, /* suffix = */ NULL, /* root = */ NULL, CONF_FILES_REGULAR | CONF_FILES_CHASE_BASENAME, search3));
strv_print(result);
ASSERT_TRUE(strv_equal(result, STRV_MAKE(strjoina(t2, "/absolute-empty.real"),
strjoina(t2, "/absolute-non-empty.real"),
strjoina(t2, "/relative-empty.real"),
strjoina(t2, "/relative-non-empty.real"))));
result = strv_free(result);
ASSERT_OK(conf_files_list(&result, /* suffix = */ NULL, t, CONF_FILES_FILTER_MASKED, "/dir3/"));
strv_print(result);
ASSERT_TRUE(strv_equal(result, STRV_MAKE(strjoina(search3, "absolute-non-empty-for-root.conf"),
@@ -221,14 +213,6 @@ TEST(conf_files_list) {
strjoina(search3, "relative-non-empty-for-root.conf"))));
result = strv_free(result);
ASSERT_OK(conf_files_list(&result, /* suffix = */ NULL, t, CONF_FILES_REGULAR | CONF_FILES_CHASE_BASENAME, "/dir3/"));
strv_print(result);
ASSERT_TRUE(strv_equal(result, STRV_MAKE(strjoina(t, "/absolute-empty-for-root.real"),
strjoina(t, "/absolute-non-empty-for-root.real"),
strjoina(t, "/relative-empty-for-root.real"),
strjoina(t, "/relative-non-empty-for-root.real"))));
result = strv_free(result);
ASSERT_OK(conf_files_list_at(&result, /* suffix = */ NULL, AT_FDCWD, CONF_FILES_FILTER_MASKED, search3));
strv_print(result);
ASSERT_TRUE(strv_equal(result, STRV_MAKE(strjoina(search3, "absolute-non-empty.conf"),
@@ -257,14 +241,6 @@ TEST(conf_files_list) {
strjoina(search3, "relative-non-empty.conf"))));
result = strv_free(result);
ASSERT_OK(conf_files_list_at(&result, /* suffix = */ NULL, AT_FDCWD, CONF_FILES_REGULAR | CONF_FILES_CHASE_BASENAME, search3));
strv_print(result);
ASSERT_TRUE(strv_equal(result, STRV_MAKE(strjoina(t2, "/absolute-empty.real"),
strjoina(t2, "/absolute-non-empty.real"),
strjoina(t2, "/relative-empty.real"),
strjoina(t2, "/relative-non-empty.real"))));
result = strv_free(result);
ASSERT_OK(conf_files_list_at(&result, /* suffix = */ NULL, tfd, CONF_FILES_FILTER_MASKED, "/dir3/"));
strv_print(result);
ASSERT_TRUE(strv_equal(result, STRV_MAKE("dir3/absolute-non-empty-for-root.conf",
@@ -293,14 +269,6 @@ TEST(conf_files_list) {
"dir3/relative-non-empty-for-root.conf")));
result = strv_free(result);
ASSERT_OK(conf_files_list_at(&result, /* suffix = */ NULL, tfd, CONF_FILES_REGULAR | CONF_FILES_CHASE_BASENAME, "/dir3/"));
strv_print(result);
ASSERT_TRUE(strv_equal(result, STRV_MAKE("absolute-empty-for-root.real",
"absolute-non-empty-for-root.real",
"relative-empty-for-root.real",
"relative-non-empty-for-root.real")));
result = strv_free(result);
/* filename only */
ASSERT_OK(conf_files_list_strv(&result, ".conf", NULL, CONF_FILES_FILTER_MASKED | CONF_FILES_BASENAME, STRV_MAKE_CONST(search1, search2)));
strv_print(result);