Path -> fs::path in functions of file-system.cc

src/libstore/builtins/buildenv.cc

@@ -41,7 +41,7 @@ static void createLinks(State & state, const Path & srcDir, const Path & dstDir,
  /* not matched by glob */
  continue;
  auto srcFile = (fs::path{srcDir} / name).string();
- auto dstFile = (fs::path{dstDir} / name).string();
+ auto dstFile = fs::path{dstDir} / name;
 
  fs::file_status srcSt;
 
@@ -79,7 +79,7 @@ static void createLinks(State & state, const Path & srcDir, const Path & dstDir,
  createLinks(state, srcFile, dstFile, priority);
  continue;
  } else if (fs::is_symlink(dstSt)) {
- auto target = canonPath(dstFile, true);
+ auto target = canonPath(dstFile.string(), true);
  if (!fs::is_directory(fs::symlink_status(target)))
  throw Error("collision between '%1%' and non-directory '%2%'", srcFile, target);
  if (unlink(dstFile.c_str()) == -1)

src/libstore/unix/build/local-derivation-goal.cc

@@ -1831,7 +1831,7 @@ void LocalDerivationGoal::runChild()
  if (pathExists(path))
  ss.push_back(path);
 
- if (settings.caFile != "" && pathExists(settings.caFile)) {
+ if (settings.caFile != "" && pathExists(settings.caFile.to_string())) {
  Path caFile = settings.caFile;
  pathsInChroot.try_emplace("/etc/ssl/certs/ca-certificates.crt", canonPath(caFile, true), true);
  }

src/libutil/file-system.cc

@@ -186,7 +186,7 @@ std::optional<struct stat> unix::maybeLstat(const Path & path)
 }
 #endif
 
-std::optional<fs::file_status> maybeSymlinkStat(const Path & path)
+std::optional<fs::file_status> maybeSymlinkStat(const fs::path & path)
 {
  try {
  auto st = fs::symlink_status(path);
@@ -199,12 +199,12 @@ std::optional<fs::file_status> maybeSymlinkStat(const Path & path)
 }
 
 
-bool pathExists(const Path & path)
+bool pathExists(const fs::path & path)
 {
  return maybeSymlinkStat(path).has_value();
 }
 
-bool pathAccessible(const Path & path)
+bool pathAccessible(const fs::path & path)
 {
  try {
  return pathExists(path);
@@ -640,7 +640,7 @@ void copyFile(const fs::path & from, const fs::path & to, bool andDelete)
  throw Error("file '%s' has an unsupported type", from);
  }
 
- setWriteTime(to, lstat(from.string().c_str()));
+ setWriteTime(to, unix::lstat(from.string().c_str()));
  if (andDelete) {
  if (!fs::is_symlink(fromStatus))
  fs::permissions(from, fs::perms::owner_write, fs::perm_options::add | fs::perm_options::);

src/libutil/file-system.hh

@@ -97,20 +97,20 @@ struct stat lstat(const Path & path);
  * call `std::filesystem::symlink_status` on the given path if it exists.
  * @return std::nullopt if the path doesn't exist, or an optional containing the result of `std::filesystem::symlink_status` otherwise
  */
-std::optional<std::filesystem::file_status> maybeSymlinkStat(const Path & path);
+std::optional<std::filesystem::file_status> maybeSymlinkStat(const std::filesystem::path & path);
 
 /**
  * @return true iff the given path exists.
  */
-bool pathExists(const Path & path);
+bool pathExists(const std::filesystem::path & path);
 
 /**
  * A version of pathExists that returns false on a permission error.
  * Useful for inferring default paths across directories that might not
  * be readable.
  * @return true iff the given path can be accessed and exists
  */
-bool pathAccessible(const Path & path);
+bool pathAccessible(const std::filesystem::path & path);
 
 /**
  * Read the contents (target) of a symbolic link. The result is not