maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Handle the case where the search path element is a regular file.

Browse source
This commit is contained in:
Eelco Dolstra 2011-08-06 18:45:28 +00:00
parent 00a724ebc6
commit 9d091ee99a
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libexpr/parser.y
View file

@ -558,7 +558,8 @@ Path EvalState::findFile(const string & path)
if (path.compare(0, i->first.size(), i->first) != 0 || if (path.compare(0, i->first.size(), i->first) != 0 ||
(path.size() > i->first.size() && path[i->first.size()] != '/')) (path.size() > i->first.size() && path[i->first.size()] != '/'))
continue; continue;
res = i->second + "/" + string(path, i->first.size()); res = i->second +
(path.size() == i->first.size() ? "" : "/" + string(path, i->first.size()));
} }
if (pathExists(res)) return canonPath(res); if (pathExists(res)) return canonPath(res);
} }