From c987f1f9c3add1eb3ad06ce40e9e1f521793cf77 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Sun, 26 Jun 2011 11:37:00 +0200 Subject: beta 2011.06.26 11:37 --- scripts/context/lua/mtxrun.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/context/lua') diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index af7298858..33be959e2 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -2608,10 +2608,10 @@ end local trick_1 = char(1) local trick_2 = "^" .. trick_1 .. "/+" -function file.join(...) +function file.join(...) -- rather dirty local lst = { ... } local a, b = lst[1], lst[2] - if a == "" then + if not a or a == "" then -- not a added lst[1] = trick_1 elseif b and find(a,"^/+$") and find(b,"^/") then lst[1] = "" @@ -12483,7 +12483,7 @@ local function find_intree(filename,filetype,wantedfiles,allresults) if not subpath or subpath == "" then -- rootscan already done elseif type(subpath) == "string" then - local fname = check_subpath(filejoin(ppname,subpath,w)) + local fname = check_subpath(filejoin(pname,subpath,w)) if fname then result[#result+1] = fname done = true @@ -12497,7 +12497,7 @@ local function find_intree(filename,filetype,wantedfiles,allresults) if sp == "" then -- roottest already done else - local fname = check_subpath(filejoin(ppname,sp,w)) + local fname = check_subpath(filejoin(pname,sp,w)) if fname then result[#result+1] = fname done = true -- cgit v1.2.3