From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 22 Oct 2018 04:46:35 +0000 (+0900)
Subject: udevadm: use path friendly functions
X-Git-Tag: v240~493^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b753e14ac8e1cf512b5ee6428a04a4e6cd1b9844;p=thirdparty%2Fsystemd.git

udevadm: use path friendly functions
---

diff --git a/src/udev/udevadm-util.c b/src/udev/udevadm-util.c
index 6cff5ef84c0..1dbcf979b17 100644
--- a/src/udev/udevadm-util.c
+++ b/src/udev/udevadm-util.c
@@ -2,17 +2,23 @@
 
 #include <errno.h>
 
+#include "alloc-util.h"
 #include "device-private.h"
 #include "path-util.h"
-#include "string-util.h"
 #include "udevadm-util.h"
 
 int find_device(const char *id, const char *prefix, sd_device **ret) {
+        _cleanup_free_ char *buf = NULL;
+
         assert(id);
         assert(ret);
 
-        if (prefix && !startswith(id, prefix))
-                id = strjoina(prefix, id);
+        if (prefix && !path_startswith(id, prefix)) {
+                buf = path_join(NULL, prefix, id);
+                if (!buf)
+                        return -ENOMEM;
+                id = buf;
+        }
 
         if (path_startswith(id, "/sys/"))
                 return sd_device_new_from_syspath(ret, id);