File Locking: only compute absolute path, if not absolute already

... and in this way, ensure we can lock files given by absolute
path even if we don't have a working directory. While there, drop
uncessary split just to combine of the file name.

(cherry picked from 0039bf3dabf0068870e59acfa49683007d378c53)

1 files changed, 16 insertions, 5 deletions

diff --git a/src/utils/cpp/file_locking.cpp b/src/utils/cpp/file_locking.cpp
index 3868af1b..c633b32b 100644
--- a/src/utils/cpp/file_locking.cpp
+++ b/src/utils/cpp/file_locking.cpp
@@ -80,15 +80,26 @@ auto LockFile::GetLockFilePath(std::filesystem::path const& fspath) noexcept
     -> std::optional<std::filesystem::path> {
     try {
         // bring to normal form
-        auto abs_fspath = ToNormalPath(std::filesystem::absolute(fspath));
-        auto filename = abs_fspath.filename();
-        auto parent = abs_fspath.parent_path();
+        auto filename = ToNormalPath(fspath);
+        if (not filename.is_absolute()) {
+            try {
+                filename = std::filesystem::absolute(fspath);
+            } catch (std::exception const& e) {
+                Logger::Log(LogLevel::Error,
+                            "Failed to determine absolute path for lock file "
+                            "name {}: {}",
+                            fspath.string(),
+                            e.what());
+                return std::nullopt;
+            }
+        }
+        auto parent = filename.parent_path();
         // create parent folder
         if (not FileSystemManager::CreateDirectory(parent)) {
             return std::nullopt;
         }
-        // get lock file name
-        return parent / filename;
+        // return lock file name
+        return filename;
     } catch (std::exception const& ex) {
         Logger::Log(
             LogLevel::Error,