commit 85ba64a653de3ede60a228f42f62dcf1ab55ca17
author Matt Spinler <spinler@us.ibm.com> Fri Mar 15 12:29:26 2019 -0500
committer Matt Spinler <spinler@us.ibm.com> Fri Mar 15 12:29:26 2019 -0500
tree 7a740ff24a179aef7870275265239cb10928bf82
parent 9e997b4da98725401769ef82fe26e11c46a059d9

Don't std::filesystem::path::/= an absolute path

Unlike std::experimental::filesystem::path, with
std::filesystem::path, the /= operator will turn an append
of an absolute path (starts with a '/') into a '='.

So, ensure the paths aren't absolute.

Change-Id: Ie8fb9d056042e277415e8ea0eb29d094a2665611
Signed-off-by: Matt Spinler <spinler@us.ibm.com>

sysfs.cpp

diff --git a/sysfs.cpp b/sysfs.cpp
index e554afe..09fc26b 100644
--- a/sysfs.cpp
+++ b/sysfs.cpp
@@ -162,10 +162,16 @@
     return emptyString;
 }
 
-std::string findHwmonFromOFPath(const std::string& ofNode)
+std::string findHwmonFromOFPath(std::string ofNode)
 {
     static constexpr auto hwmonRoot = "/sys/class/hwmon";
 
+    // Can't append an absolute path
+    if (!ofNode.empty() && (ofNode.front() == '/'))
+    {
+        ofNode = ofNode.substr(1);
+    }
+
     fs::path fullOfPath{ofRoot};
     fullOfPath /= ofNode;
 
@@ -203,8 +209,14 @@
     return emptyString;
 }
 
-std::string findHwmonFromDevPath(const std::string& devPath)
+std::string findHwmonFromDevPath(std::string devPath)
 {
+    // Can't append an absolute path
+    if (!devPath.empty() && devPath.front() == '/')
+    {
+        devPath = devPath.substr(1);
+    }
+
     fs::path p{"/sys"};
     p /= devPath;
     p /= "hwmon";