mirror of
https://github.com/sbrl/Minetest-WorldEditAdditions.git
synced 2024-11-22 23:42:59 +00:00
split_shell: correctly handle escaping edge cases
This commit is contained in:
parent
31a4d89a49
commit
c282e286bb
1 changed files with 13 additions and 2 deletions
|
@ -36,7 +36,10 @@ function split_shell(text)
|
||||||
if curchar == "\"" and prevchar ~= "\\" and is_whitespace(nextchar) then
|
if curchar == "\"" and prevchar ~= "\\" and is_whitespace(nextchar) then
|
||||||
-- It's the end of a quote!
|
-- It's the end of a quote!
|
||||||
mode = "NORMAL"
|
mode = "NORMAL"
|
||||||
elseif (curchar == "\\" and nextchar ~= "\"" and not is_whitespace(nextnextchar)) or curchar ~= "\\" then
|
elseif (curchar == "\\" and (
|
||||||
|
nextchar ~= "\""
|
||||||
|
or (nextchar == "\"" and not is_whitespace(nextnextchar))
|
||||||
|
)) or curchar ~= "\\" then
|
||||||
-- It's a regular character
|
-- It's a regular character
|
||||||
table.insert(acc, curchar)
|
table.insert(acc, curchar)
|
||||||
end
|
end
|
||||||
|
@ -44,7 +47,10 @@ function split_shell(text)
|
||||||
if curchar == "'" and prevchar ~= "\\" and is_whitespace(nextchar) then
|
if curchar == "'" and prevchar ~= "\\" and is_whitespace(nextchar) then
|
||||||
-- It's the end of a quote!
|
-- It's the end of a quote!
|
||||||
mode = "NORMAL"
|
mode = "NORMAL"
|
||||||
elseif (curchar == "\\" and nextchar ~= "'" and not is_whitespace(nextnextchar)) or curchar ~= "\\" then
|
elseif (curchar == "\\" and (
|
||||||
|
nextchar ~= "'"
|
||||||
|
or (nextchar == "'" and not is_whitespace(nextnextchar))
|
||||||
|
)) or curchar ~= "\\" then
|
||||||
-- It's a regular character
|
-- It's a regular character
|
||||||
table.insert(acc, curchar)
|
table.insert(acc, curchar)
|
||||||
end
|
end
|
||||||
|
@ -70,3 +76,8 @@ test("yay \"yay yay\" yay")
|
||||||
test("yay \"yay\\\" yay\" yay")
|
test("yay \"yay\\\" yay\" yay")
|
||||||
test("yay \"yay 'inside quotes' yay\" yay")
|
test("yay \"yay 'inside quotes' yay\" yay")
|
||||||
test("yay 'inside quotes' another")
|
test("yay 'inside quotes' another")
|
||||||
|
test("y\"ay \"yay 'in\\\"side quotes' yay\" y\\\"ay")
|
||||||
|
|
||||||
|
-- for i=1,10000 do
|
||||||
|
-- split_shell("y\"ay \"yay 'in\\\"side quotes' yay\" y\\\"ay")
|
||||||
|
-- end
|
||||||
|
|
Loading…
Reference in a new issue