summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-06-17 01:56:44 +0200
committerLennart Poettering <lennart@poettering.net>2014-06-17 02:43:44 +0200
commitcebed5005b5ede17fc52ab50c054fca73bc938b8 (patch)
tree557cbb6abbb268068fd021eac22dad044e033b2b /src
parent749ebb2da4933de68bfaa4d6f6ffd9e4692ee547 (diff)
conf-files: fix when for --root= logic
This is based on parts of similar patches from Michael Marineau and Lukas Nykrin, but simply uses strappenda3().
Diffstat (limited to 'src')
-rw-r--r--src/shared/conf-files.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c
index 5201782183..59bc8ceed9 100644
--- a/src/shared/conf-files.c
+++ b/src/shared/conf-files.c
@@ -37,10 +37,20 @@
#include "hashmap.h"
#include "conf-files.h"
-static int files_add(Hashmap *h, const char *dirpath, const char *suffix) {
+static int files_add(Hashmap *h, const char *dirpath, const char *suffix, const char *root) {
_cleanup_closedir_ DIR *dir = NULL;
- dir = opendir(dirpath);
+ assert(dirpath);
+ assert(suffix);
+
+ if (isempty(root))
+ dir = opendir(dirpath);
+ else {
+ const char *p;
+
+ p = strappenda3(root, "/", dirpath);
+ dir = opendir(p);
+ }
if (!dir) {
if (errno == ENOENT)
return 0;
@@ -108,7 +118,7 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
return -ENOMEM;
STRV_FOREACH(p, dirs) {
- r = files_add(fh, *p, suffix);
+ r = files_add(fh, *p, suffix, root);
if (r == -ENOMEM) {
hashmap_free_free(fh);
return r;