diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-05-12 17:14:46 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-05-12 17:52:32 +0200 |
| commit | 947f59ba2bb860c70bb6192fedf7208a73670e87 (patch) | |
| tree | aebbe2ed555491fd812988c16ecdfe383f3053a1 /src/shared | |
| parent | 9b05a3715ba406974501629d00ea25c8eca72377 (diff) | |
| download | systemd-947f59ba2bb860c70bb6192fedf7208a73670e87.tar.gz | |
conf-parser: Add root argument to config_parse_many()
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/conf-parser.c | 8 | ||||
| -rw-r--r-- | src/shared/conf-parser.h | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index 138a3a8cc9..21ba7f6914 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -584,6 +584,7 @@ int config_parse_config_file( static int config_get_dropin_files( const char* const* conf_file_dirs, const char *dropin_dirname, + const char *root, char ***ret) { _cleanup_strv_free_ char **dropin_dirs = NULL; @@ -599,7 +600,7 @@ static int config_get_dropin_files( if (r < 0) return r; - return conf_files_list_strv(ret, ".conf", NULL, 0, (const char* const*) dropin_dirs); + return conf_files_list_strv(ret, ".conf", root, 0, (const char* const*) dropin_dirs); } /* Parse each config file in the directories specified as strv. */ @@ -607,6 +608,7 @@ int config_parse_many( const char* const* conf_files, const char* const* conf_file_dirs, const char *dropin_dirname, + const char *root, const char *sections, ConfigItemLookup lookup, const void *table, @@ -623,7 +625,7 @@ int config_parse_many( assert(sections); assert(table); - r = config_get_dropin_files(conf_file_dirs, dropin_dirname, &files); + r = config_get_dropin_files(conf_file_dirs, dropin_dirname, root, &files); if (r < 0) return r; @@ -659,7 +661,7 @@ static int dropins_get_stats_by_path( if (!strextend(&dropin_dirname, ".d")) return -ENOMEM; - r = config_get_dropin_files(conf_file_dirs, dropin_dirname, &files); + r = config_get_dropin_files(conf_file_dirs, dropin_dirname, /* root = */ NULL, &files); if (r < 0) return r; diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h index e5aeeac687..902717965c 100644 --- a/src/shared/conf-parser.h +++ b/src/shared/conf-parser.h @@ -105,6 +105,7 @@ int config_parse_many( const char* const* conf_files, /* possibly empty */ const char* const* conf_file_dirs, const char *dropin_dirname, + const char *root, const char *sections, /* nulstr */ ConfigItemLookup lookup, const void *table, |