Merge "Add `getCwd`" into main

2 files changed, 16 insertions, 5 deletions

diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc
index 8c69c9864..1d3eba58f 100644
--- a/src/libutil/file-system.cc
+++ b/src/libutil/file-system.cc
@@ -18,15 +18,19 @@ namespace fs = std::filesystem;
 
 namespace nix {
 
+Path getCwd() {
+    char buf[PATH_MAX];
+    if (!getcwd(buf, sizeof(buf))) {
+        throw SysError("cannot get cwd");
+    }
+    return Path(buf);
+}
+
 Path absPath(Path path, std::optional<PathView> dir, bool resolveSymlinks)
 {
     if (path.empty() || path[0] != '/') {
         if (!dir) {
-            char buf[PATH_MAX];
-            if (!getcwd(buf, sizeof(buf))) {
-                throw SysError("cannot get cwd");
-            }
-            path = concatStrings(buf, "/", path);
+            path = concatStrings(getCwd(), "/", path);
         } else {
             path = concatStrings(*dir, "/", path);
         }
diff --git a/src/libutil/file-system.hh b/src/libutil/file-system.hh
index 0a54d1a3b..d95e8eba5 100644
--- a/src/libutil/file-system.hh
+++ b/src/libutil/file-system.hh
@@ -30,6 +30,13 @@ struct Sink;
 struct Source;
 
 /**
+ * Get the current working directory.
+ *
+ * Throw an error if the current directory cannot get got.
+ */
+Path getCwd();
+
+/**
  * @return An absolutized path, resolving paths relative to the
  * specified directory, or the current directory otherwise.  The path
  * is also canonicalised.