lix-project/lix
20
57
Fork 31
Code Issues 351 Code Review (Gerrit) Projects 3 Releases Wiki Activity

revert libutil change

Browse source
This commit is contained in:
Jude Taylor 2015-10-21 14:40:35 -07:00
parent 992cda1b11
commit af1218a86a
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libutil/util.cc
View file

@ -167,11 +167,10 @@ string baseNameOf(const Path & path)
bool isInDir(const Path & path, const Path & dir) bool isInDir(const Path & path, const Path & dir)
{ {
return dir == "/" return path[0] == '/'
|| (path[0] == '/' && string(path, 0, dir.size()) == dir
&& string(path, 0, dir.size()) == dir && path.size() >= dir.size() + 2
&& path.size() >= dir.size() + 2 && path[dir.size()] == '/';
&& path[dir.size()] == '/');
} }