stable 2008.05.21 15:21

1 files changed, 15 insertions, 7 deletions

diff --git a/tex/context/base/l-file.lua b/tex/context/base/l-file.lua
index 91998532b..f49add545 100644
--- a/tex/context/base/l-file.lua
+++ b/tex/context/base/l-file.lua
@@ -134,14 +134,22 @@ end
 --~ print("../test/"       .. " == " .. file.collapse_path("../test/"))
 --~ print("a/a"            .. " == " .. file.collapse_path("a/b/c/../../a"))
 
+--~ function file.collapse_path(str)
+--~     local ok, n = false, 0
+--~     while not ok do
+--~         ok = true
+--~         str, n = str:gsub("[^%./]+/%.%./", function(s)
+--~             ok = false
+--~             return ""
+--~         end)
+--~     end
+--~     return (str:gsub("/%./","/"))
+--~ end
+
 function file.collapse_path(str)
-    local ok, n = false, 0
-    while not ok do
-        ok = true
-        str, n = str:gsub("[^%./]+/%.%./", function(s)
-            ok = false
-            return ""
-        end)
+    local n = 1
+    while n > 0 do
+        str, n = str:gsub("([^/%.]+/%.%./)","")
     end
     return (str:gsub("/%./","/"))
 end