AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #191 from Lusito/feature/pathjoinfix

Browse Source 
fix for path.join problem when both string start with a "..", a unit …
This commit is contained in:
Manu Evans 2015-08-04 01:46:10 +10:00
commit 25bb49e4d5
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/host/path_join.c
View File

@ -71,6 +71,10 @@ int path_join(lua_State* L)
break; break;
} }
if (start[0] == '.' && start[1] == '.' && start[2] == '\0'){
break;
}
/* otherwise trim segment and the ".." sequence */ /* otherwise trim segment and the ".." sequence */
if (start != buffer) { if (start != buffer) {
--start; --start;

4
tests/base/test_path.lua
View File

@ -267,6 +267,10 @@
test.isequal("", path.join("p1/p2/", "../..")) test.isequal("", path.join("p1/p2/", "../.."))
end end
function suite.join_OnBothUpTwoFolders()
test.isequal("../../../../foo", path.join("../../", "../../foo"))
end
function suite.join_OnUptwoFolders() function suite.join_OnUptwoFolders()
test.isequal("p1/foo", path.join("p1/p2/p3", "../../foo")) test.isequal("p1/foo", path.join("p1/p2/p3", "../../foo"))
end end