From 375eadd911a9f83f89f1e7de5e05f44cc81e3642 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 19 Jun 2014 19:07:06 -0700 Subject: shared: fix search_and_fopen with alternate roots Update for the current behavior of path_strv_resolve which now returns paths relative to the given root, not the full absolute paths. --- src/shared/util.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/shared/util.c b/src/shared/util.c index c1e1f9f020..aaf109ea63 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -5686,7 +5686,10 @@ static int search_and_fopen_internal(const char *path, const char *mode, const c _cleanup_free_ char *p = NULL; FILE *f; - p = strjoin(*i, "/", path, NULL); + if (root) + p = strjoin(root, *i, "/", path, NULL); + else + p = strjoin(*i, "/", path, NULL); if (!p) return -ENOMEM; -- cgit v1.2.3-54-g00ecf