* Resolve all symlink components in the location of the temporary

  build directory (TMPDIR, i.e., /tmp).  Fixes NIX-26.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index 9601e65b3c..aac2acd173 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -64,8 +64,10 @@ string getEnv(const string & key, const string & def = "");
 Path absPath(Path path, Path dir = "");
 
 /* Canonicalise a path by removing all `.' or `..' components and
-   double or trailing slashes. */
-Path canonPath(const Path & path);
+   double or trailing slashes.  Optionally resolves all symlink
+   components such that each component of the resulting path is *not*
+   a symbolic link. */
+Path canonPath(const Path & path, bool resolveSymlinks = false);
 
 /* Return the directory part of the given canonical path, i.e.,
    everything before the final `/'.  If the path is the root or an