lunaphied/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #4831 from matthewbauer/fix-extra-slash-in-canon-path

Browse source 
Fix extra slash in canonPath output
This commit is contained in:
Eelco Dolstra 2021-05-19 11:10:43 +02:00 committed by GitHub
parent 57f321f3ce 3d90ab9345
commit 7234cf39be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libutil/util.cc
View file

@ -155,6 +155,9 @@ Path canonPath(const Path & path, bool resolveSymlinks)
s.clear(); /* restart for symlinks pointing to absolute path */ s.clear(); /* restart for symlinks pointing to absolute path */
} else { } else {
s = dirOf(s); s = dirOf(s);
if (s == "/") { // we don’t want trailing slashes here, which dirOf only produces if s = /
s.clear();
}
} }
} }
} }