From: Michael Biebl <mbiebl@gmail.com>
Date: Thu, 1 Jun 2017 01:21:11 +0000 (+0200)
Subject: hwdb: use path_join() to generate the hwdb_bin path (#6063)
X-Git-Tag: v234~151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0aac506b64dd6102374635290ca979b080d1192f;p=thirdparty%2Fsystemd.git

hwdb: use path_join() to generate the hwdb_bin path (#6063)

This avoids having double slashes which can confuse selinux.
---

diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index a9539c812a5..793398ca688 100644
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -31,6 +31,7 @@
 #include "hwdb-util.h"
 #include "label.h"
 #include "mkdir.h"
+#include "path-util.h"
 #include "selinux-util.h"
 #include "strbuf.h"
 #include "string-util.h"
@@ -670,7 +671,7 @@ static int hwdb_update(int argc, char *argv[], void *userdata) {
         log_debug("strings dedup'ed: %8zu bytes (%8zu)",
                   trie->strings->dedup_len, trie->strings->dedup_count);
 
-        hwdb_bin = strjoin(arg_root, "/", arg_hwdb_bin_dir, "/hwdb.bin");
+        hwdb_bin = path_join(arg_root, arg_hwdb_bin_dir, "hwdb.bin");
         if (!hwdb_bin)
                 return -ENOMEM;