* Handle multiple indirect symlinks when loading a Nix expression.

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

View file

@ -205,6 +205,21 @@ on systems that have the <function>setresuid()</function> system call
(such as Linux and FreeBSD), so on those systems the binaries are
simply owned by the Nix user.</para></warning>
<!--
warning: the nix-builders group should contain *only* the Nix
builders, and nothing else. If the Nix account is compromised, you
can execute programs under the accounts in the nix-builders group, so
it obviously shouldnt contain any “real” user accounts. So dont use
an existing group like <literal>users</literal> — just create a new
one.
-->
</section>
</section>

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

View file

@ -1113,10 +1113,7 @@ static void opDefaultExpr(Globals & globals,
if (opArgs.size() != 1)
throw UsageError(format("exactly one argument expected"));
Path defNixExpr = absPath(opArgs.front());
Path defNixExprLink = getDefNixExprPath();
switchLink(defNixExprLink, defNixExpr);
switchLink(getDefNixExprPath(), absPath(opArgs.front()));
}