conf-files: port conf_files_list() over to chase_symlinks() from prefix_roota()

This commit is contained in:
Lennart Poettering
2022-08-22 14:08:48 +02:00
parent 3979ea8644
commit 1d1c226f6c
+7 -10
View File
@@ -5,6 +5,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "chase-symlinks.h"
#include "conf-files.h"
#include "def.h"
#include "dirent-util.h"
@@ -28,23 +29,19 @@ static int files_add(
unsigned flags,
const char *path) {
_cleanup_free_ char *dirpath = NULL;
_cleanup_closedir_ DIR *dir = NULL;
const char *dirpath;
int r;
assert(h);
assert((flags & CONF_FILES_FILTER_MASKED) == 0 || masked);
assert(path);
dirpath = prefix_roota(root, path);
dir = opendir(dirpath);
if (!dir) {
if (errno == ENOENT)
return 0;
return log_debug_errno(errno, "Failed to open directory '%s': %m", dirpath);
}
r = chase_symlinks_and_opendir(path, root, CHASE_PREFIX_ROOT, &dirpath, &dir);
if (r == -ENOENT)
return 0;
if (r < 0)
return log_debug_errno(r, "Failed to open directory '%s/%s': %m", empty_or_root(root) ? "" : root, dirpath);
FOREACH_DIRENT(de, dir, return -errno) {
struct stat st;