diff options
Diffstat (limited to 'src/shared/conf-files.c')
| -rw-r--r-- | src/shared/conf-files.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c index c86bb03074..5201782183 100644 --- a/src/shared/conf-files.c +++ b/src/shared/conf-files.c @@ -37,12 +37,8 @@ #include "hashmap.h" #include "conf-files.h" -static int files_add(Hashmap *h, const char *root, const char *path, const char *suffix) { +static int files_add(Hashmap *h, const char *dirpath, const char *suffix) { _cleanup_closedir_ DIR *dir = NULL; - _cleanup_free_ char *dirpath = NULL; - - if (asprintf(&dirpath, "%s%s", root ? root : "", path) < 0) - return -ENOMEM; dir = opendir(dirpath); if (!dir) { @@ -104,7 +100,7 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const assert(suffix); /* This alters the dirs string array */ - if (!path_strv_canonicalize_uniq(dirs)) + if (!path_strv_canonicalize_absolute_uniq(dirs, root)) return -ENOMEM; fh = hashmap_new(string_hash_func, string_compare_func); @@ -112,7 +108,7 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const return -ENOMEM; STRV_FOREACH(p, dirs) { - r = files_add(fh, root, *p, suffix); + r = files_add(fh, *p, suffix); if (r == -ENOMEM) { hashmap_free_free(fh); return r; |