From 9c65967bf03dda21ef97fac326ed05ef0456c270 Mon Sep 17 00:00:00 2001
From: Taco Hoekwater <taco@elvenkind.com>
Date: Wed, 8 Jun 2011 14:18:13 +0000
Subject: fix recursion for context mkiv runtime paths

git-svn-id: svn://tug.org/texlive/trunk@22867 c570f23f-e606-0410-a88d-b1316a301751
---
 Build/source/texk/texlive/context/mtxrun                 | 5 ++++-
 Master/bin/alpha-linux/mtxrun                            | 5 ++++-
 Master/bin/amd64-freebsd/mtxrun                          | 5 ++++-
 Master/bin/amd64-kfreebsd/mtxrun                         | 5 ++++-
 Master/bin/i386-cygwin/mtxrun                            | 5 ++++-
 Master/bin/i386-freebsd/mtxrun                           | 5 ++++-
 Master/bin/i386-kfreebsd/mtxrun                          | 5 ++++-
 Master/bin/i386-linux/mtxrun                             | 5 ++++-
 Master/bin/i386-netbsd/mtxrun                            | 5 ++++-
 Master/bin/i386-solaris/mtxrun                           | 5 ++++-
 Master/bin/mips-irix/mtxrun                              | 5 ++++-
 Master/bin/powerpc-aix/mtxrun                            | 5 ++++-
 Master/bin/powerpc-linux/mtxrun                          | 5 ++++-
 Master/bin/sparc-linux/mtxrun                            | 5 ++++-
 Master/bin/sparc-solaris/mtxrun                          | 5 ++++-
 Master/bin/universal-darwin/mtxrun                       | 5 ++++-
 Master/bin/win32/mtxrun.lua                              | 5 ++++-
 Master/bin/x86_64-darwin/mtxrun                          | 5 ++++-
 Master/bin/x86_64-linux/mtxrun                           | 5 ++++-
 Master/bin/x86_64-solaris/mtxrun                         | 5 ++++-
 Master/texmf-dist/scripts/context/lua/mtxrun.lua         | 5 ++++-
 Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua | 5 ++++-
 Master/texmf-dist/scripts/context/stubs/unix/mtxrun      | 5 ++++-
 Master/texmf-dist/tex/context/base/data-exp.lua          | 3 +++
 24 files changed, 95 insertions(+), 23 deletions(-)

diff --git a/Build/source/texk/texlive/context/mtxrun b/Build/source/texk/texlive/context/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Build/source/texk/texlive/context/mtxrun
+++ b/Build/source/texk/texlive/context/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/alpha-linux/mtxrun b/Master/bin/alpha-linux/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/alpha-linux/mtxrun
+++ b/Master/bin/alpha-linux/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/amd64-freebsd/mtxrun b/Master/bin/amd64-freebsd/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/amd64-freebsd/mtxrun
+++ b/Master/bin/amd64-freebsd/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/amd64-kfreebsd/mtxrun b/Master/bin/amd64-kfreebsd/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/amd64-kfreebsd/mtxrun
+++ b/Master/bin/amd64-kfreebsd/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/i386-cygwin/mtxrun b/Master/bin/i386-cygwin/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/i386-cygwin/mtxrun
+++ b/Master/bin/i386-cygwin/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/i386-freebsd/mtxrun b/Master/bin/i386-freebsd/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/i386-freebsd/mtxrun
+++ b/Master/bin/i386-freebsd/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/i386-kfreebsd/mtxrun b/Master/bin/i386-kfreebsd/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/i386-kfreebsd/mtxrun
+++ b/Master/bin/i386-kfreebsd/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/i386-linux/mtxrun b/Master/bin/i386-linux/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/i386-linux/mtxrun
+++ b/Master/bin/i386-linux/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/i386-netbsd/mtxrun b/Master/bin/i386-netbsd/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/i386-netbsd/mtxrun
+++ b/Master/bin/i386-netbsd/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/i386-solaris/mtxrun b/Master/bin/i386-solaris/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/i386-solaris/mtxrun
+++ b/Master/bin/i386-solaris/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/mips-irix/mtxrun b/Master/bin/mips-irix/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/mips-irix/mtxrun
+++ b/Master/bin/mips-irix/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/powerpc-aix/mtxrun b/Master/bin/powerpc-aix/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/powerpc-aix/mtxrun
+++ b/Master/bin/powerpc-aix/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/powerpc-linux/mtxrun b/Master/bin/powerpc-linux/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/powerpc-linux/mtxrun
+++ b/Master/bin/powerpc-linux/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/sparc-linux/mtxrun b/Master/bin/sparc-linux/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/sparc-linux/mtxrun
+++ b/Master/bin/sparc-linux/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/sparc-solaris/mtxrun b/Master/bin/sparc-solaris/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/sparc-solaris/mtxrun
+++ b/Master/bin/sparc-solaris/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/universal-darwin/mtxrun b/Master/bin/universal-darwin/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/universal-darwin/mtxrun
+++ b/Master/bin/universal-darwin/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/win32/mtxrun.lua b/Master/bin/win32/mtxrun.lua
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/win32/mtxrun.lua
+++ b/Master/bin/win32/mtxrun.lua
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/x86_64-darwin/mtxrun b/Master/bin/x86_64-darwin/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/x86_64-darwin/mtxrun
+++ b/Master/bin/x86_64-darwin/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/x86_64-linux/mtxrun b/Master/bin/x86_64-linux/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/x86_64-linux/mtxrun
+++ b/Master/bin/x86_64-linux/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/x86_64-solaris/mtxrun b/Master/bin/x86_64-solaris/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/x86_64-solaris/mtxrun
+++ b/Master/bin/x86_64-solaris/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/texmf-dist/scripts/context/lua/mtxrun.lua b/Master/texmf-dist/scripts/context/lua/mtxrun.lua
index f0b07dddd4b..948545bc391 100755
--- a/Master/texmf-dist/scripts/context/lua/mtxrun.lua
+++ b/Master/texmf-dist/scripts/context/lua/mtxrun.lua
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua
index f0b07dddd4b..948545bc391 100755
--- a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua
+++ b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/texmf-dist/scripts/context/stubs/unix/mtxrun b/Master/texmf-dist/scripts/context/stubs/unix/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/texmf-dist/scripts/context/stubs/unix/mtxrun
+++ b/Master/texmf-dist/scripts/context/stubs/unix/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
 
     resolvers.load()
     local e_pattern = environment.argument("pattern")
-    local e_format  = environment.arguments("format")
+    local e_format  = environment.argument("format")
     if not e_pattern then
         runners.register_arguments(filename)
         environment.initializearguments(environment.arguments_after)
diff --git a/Master/texmf-dist/tex/context/base/data-exp.lua b/Master/texmf-dist/tex/context/base/data-exp.lua
index e8138968252..a0a85d07f58 100644
--- a/Master/texmf-dist/tex/context/base/data-exp.lua
+++ b/Master/texmf-dist/tex/context/base/data-exp.lua
@@ -95,9 +95,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
     str = lpegmatch(stripper_1,str)
     if validate then
         for s in gmatch(str,"[^,]+") do
+            local restoreslashes = false
+            if gmatch(s, "//$") then restoreslashes = true end
             s = validate(s)
             if s then
                 n = n + 1 ; t[n] = s
+                if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
             end
         end
     else
-- 
cgit v1.2.3