diff options
Diffstat (limited to 'Master')
-rwxr-xr-x | Master/bin/i386-cygwin/mtxrun | 5 | ||||
-rwxr-xr-x | Master/bin/i386-kfreebsd/mtxrun | 5 | ||||
-rwxr-xr-x | Master/bin/powerpc-linux/mtxrun | 2 | ||||
-rwxr-xr-x | Master/bin/sparc-linux/mtxrun | 5 |
4 files changed, 13 insertions, 4 deletions
diff --git a/Master/bin/i386-cygwin/mtxrun b/Master/bin/i386-cygwin/mtxrun index d92f3409257..f90dbfbd7d1 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-kfreebsd/mtxrun b/Master/bin/i386-kfreebsd/mtxrun index d92f3409257..f90dbfbd7d1 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/powerpc-linux/mtxrun b/Master/bin/powerpc-linux/mtxrun index 948545bc391..f90dbfbd7d1 100755 --- a/Master/bin/powerpc-linux/mtxrun +++ b/Master/bin/powerpc-linux/mtxrun @@ -12618,7 +12618,7 @@ end local function resolve(str) -- use schemes, this one is then for the commandline only local res = resolved[str] if not res then - res = gsub(str,"([a-z][a-z]+):([^ \"\']*)",_resolve_) + res = gsub(str,"([a-z][a-z]+):([^ \"\';]*)",_resolve_) resolved[str] = res abstract[res] = str end diff --git a/Master/bin/sparc-linux/mtxrun b/Master/bin/sparc-linux/mtxrun index d92f3409257..f90dbfbd7d1 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) |