]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
hwdb: use path_join() to generate the hwdb_bin path (#6063)
authorMichael Biebl <mbiebl@gmail.com>
Thu, 1 Jun 2017 01:21:11 +0000 (03:21 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 1 Jun 2017 01:21:11 +0000 (21:21 -0400)
This avoids having double slashes which can confuse selinux.

src/hwdb/hwdb.c

index a9539c812a5315a069684c1c68fa808a04413aec..793398ca6883a8ea6d3712dbf99366984c874959 100644 (file)
@@ -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;