From 49008cd459d87f7b38045bddf5a5bbd1c6f1a189 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 3 May 2021 07:07:14 -0700 Subject: rel-path: bugfixes. * share/txr/stdlib/copy-file.tl: When removing .. components, a dotdot must only cancel preceding non-dotdot. We must check not only that the out stack is not empty but that the top element isn't dotdot. Also, eliminate empty components, like the documentation says. Lastly, we must check for the impossible cases, when the from path uses .. components that are impossible to navigate backwards to form a relative path. * tests/018/rel-path.tl: Test cases added. * txr.1: Updated with additional descriptions, fixes and examples. --- tests/018/rel-path.tl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/018/rel-path.tl b/tests/018/rel-path.tl index 1afff796..cdcc7e4f 100644 --- a/tests/018/rel-path.tl +++ b/tests/018/rel-path.tl @@ -14,4 +14,9 @@ (rel-path "abc" "d/e/f/g/h") "../d/e/f/g/h" (rel-path "abc" "d/e/../g/h") "../d/g/h" (rel-path "d/e/../g/h" ".") "../../.." - (rel-path "d/e/../g/h" "a/b") "../../../a/b") + (rel-path "d/e/../g/h" "a/b") "../../../a/b" + (rel-path "x" "../../../y") "../../../../y" + (rel-path "x///" "x") "." + (rel-path "x" "x///") "." + (rel-path "///x" "/x") "." + (rel-path "../../x" "y") :error) -- cgit v1.2.3