clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-07 06:03:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf-files: fix when for --root= logic

Browse Source 
This is based on parts of similar patches from Michael Marineau and
Lukas Nykrin, but simply uses strappenda3().

(cherry picked from commit cebed5005b)
This commit is contained in:
Lennart Poettering
2014-06-17 16:53:11 -04:00
committed by Zbigniew Jędrzejewski-Szmek
parent fe2be3dd40
commit f5fbcb6e04
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/conf-files.c
+13 -3
View File
@@ -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;