absPath(): Use std::optional

1 files changed, 3 insertions, 3 deletions

diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index dda0950a1..ab63ceb10 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -98,10 +98,10 @@ void replaceEnv(std::map<std::string, std::string> newEnv)
 }
 
 
-Path absPath(Path path, Path dir)
+Path absPath(Path path, std::optional<Path> dir)
 {
     if (path[0] != '/') {
-        if (dir == "") {
+        if (!dir) {
 #ifdef __GNU__
             /* GNU (aka. GNU/Hurd) doesn't have any limitation on path
                lengths and doesn't define `PATH_MAX'.  */
@@ -117,7 +117,7 @@ Path absPath(Path path, Path dir)
             free(buf);
 #endif
         }
-        path = dir + "/" + path;
+        path = *dir + "/" + path;
     }
     return canonPath(path);
 }