wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 08:31:16 +02:00
Code Activity

* Handle multiple indirect symlinks when loading a Nix expression.

Browse source
This commit is contained in:
Eelco Dolstra 2007-01-15 14:50:25 +00:00
parent e4b0666f8e
commit 71ceb1c161
3 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libexpr/parser.y
View file

@ -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))