about summary refs log tree commit diff
path: root/src/libexpr/parser.y
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2007-01-15T14·50+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2007-01-15T14·50+0000
commit71ceb1c16102f82e15375afb44e0ac59e39eaa23 (patch)
treea4c2e0e78a901052aeea565e5f44b43277da2bdf /src/libexpr/parser.y
parente4b0666f8eee3fc48f37c0cd3fd194c27652173c (diff)
* Handle multiple indirect symlinks when loading a Nix expression.
Diffstat (limited to 'src/libexpr/parser.y')
-rw-r--r--src/libexpr/parser.y9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 8ac3345c1f2e..3540058bc1e0 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -369,9 +369,12 @@ Expr parseExprFromFile(EvalState & state, Path path)
     /* If `path' is a symlink, follow it.  This is so that relative
        path references work. */
     struct stat st;
-    if (lstat(path.c_str(), &st))
-        throw SysError(format("getting status of `%1%'") % path);
-    if (S_ISLNK(st.st_mode)) path = absPath(readLink(path), dirOf(path));
+    while (true) {
+        if (lstat(path.c_str(), &st))
+            throw SysError(format("getting status of `%1%'") % path);
+        if (!S_ISLNK(st.st_mode)) break;
+        path = absPath(readLink(path), dirOf(path));
+    }
 
     /* If `path' refers to a directory, append `/default.nix'. */
     if (stat(path.c_str(), &st))