morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

conf-parser: move config_get_dropin_files to conf-files

Browse Source
This commit is contained in:
Mike Yuan
2023-05-13 02:38:41 +08:00
parent d260875f78
commit 35c0e3444d
3 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/basic/conf-files.c
View File

@@ -350,3 +350,25 @@ int conf_files_list_with_replacement(
return 0;
}
int conf_files_list_dropins(
char ***ret,
const char *dropin_dirname,
const char *root,
const char * const *dirs) {
_cleanup_strv_free_ char **dropin_dirs = NULL;
const char *suffix;
int r;
assert(ret);
assert(dropin_dirname);
assert(dirs);
suffix = strjoina("/", dropin_dirname);
r = strv_extend_strv_concat(&dropin_dirs, (char**) dirs, suffix);
if (r < 0)
return r;
return conf_files_list_strv(ret, ".conf", root, 0, (const char* const*) dropin_dirs);
}

5
src/basic/conf-files.h
View File

@@ -24,3 +24,8 @@ int conf_files_list_with_replacement(
const char *replacement,
char ***files,
char **replace_file);
int conf_files_list_dropins(
char ***ret,
const char *dropin_dirname,
const char *root,
const char * const *dirs);

26
src/shared/conf-parser.c
View File

@@ -581,28 +581,6 @@ int config_parse_config_file(
sections, lookup, table, flags, userdata, NULL);
}
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;
const char *suffix;
int r;
assert(conf_file_dirs);
assert(dropin_dirname);
assert(ret);
suffix = strjoina("/", dropin_dirname);
r = strv_extend_strv_concat(&dropin_dirs, (char**) conf_file_dirs, suffix);
if (r < 0)
return r;
return conf_files_list_strv(ret, ".conf", root, 0, (const char* const*) dropin_dirs);
}
/* Parse each config file in the directories specified as strv. */
int config_parse_many(
const char* const* conf_files,
@@ -625,7 +603,7 @@ int config_parse_many(
assert(sections);
assert(table);
r = config_get_dropin_files(conf_file_dirs, dropin_dirname, root, &files);
r = conf_files_list_dropins(&files, dropin_dirname, root, conf_file_dirs);
if (r < 0)
return r;
@@ -661,7 +639,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, /* root = */ NULL, &files);
r = conf_files_list_dropins(&files, dropin_dirname, /* root = */ NULL, conf_file_dirs);
if (r < 0)
return r;