mirror of
https://github.com/bjc/prosody.git
synced 2025-04-01 20:27:39 +03:00
06994f0bc1
After recent changes, '--foo bar' was working, but '--foo=bar' was not. The test had a typo (?) (bar != baz) and because util.argparse is not strict by default, the typo was not caught. The typo caused the code to take a different path, and bypassed the buggy handling of --foo=bar options. I've preserved the existing test (typo and all!) because it's still an interesting test, and ensures no unintended behaviour changes compared to the old code. However I've added a new variant of the test, with strict mode enabled and the typo fixed. This test failed due to the bug, and this commit introduces a fix.
89 lines
2.1 KiB
Lua
89 lines
2.1 KiB
Lua
local function parse(arg, config)
|
|
local short_params = config and config.short_params or {};
|
|
local value_params = config and config.value_params or {};
|
|
local array_params = config and config.array_params or {};
|
|
local kv_params = config and config.kv_params or {};
|
|
local strict = config and config.strict;
|
|
local stop_on_positional = not config or config.stop_on_positional ~= false;
|
|
|
|
local parsed_opts = {};
|
|
|
|
if #arg == 0 then
|
|
return parsed_opts;
|
|
end
|
|
while true do
|
|
local raw_param = arg[1];
|
|
if not raw_param then
|
|
break;
|
|
end
|
|
|
|
local prefix = raw_param:match("^%-%-?");
|
|
if not prefix and stop_on_positional then
|
|
break;
|
|
elseif prefix == "--" and raw_param == "--" then
|
|
table.remove(arg, 1);
|
|
break;
|
|
end
|
|
|
|
if prefix then
|
|
local param = table.remove(arg, 1):sub(#prefix+1);
|
|
if #param == 1 and short_params then
|
|
param = short_params[param];
|
|
end
|
|
|
|
if not param then
|
|
return nil, "param-not-found", raw_param;
|
|
end
|
|
|
|
local uparam = param:match("^[^=]*"):gsub("%-", "_");
|
|
|
|
local param_k, param_v;
|
|
if value_params[uparam] or array_params[uparam] then
|
|
param_k = uparam;
|
|
param_v = param:match("^=(.*)$", #uparam+1);
|
|
if not param_v then
|
|
param_v = table.remove(arg, 1);
|
|
if not param_v then
|
|
return nil, "missing-value", raw_param;
|
|
end
|
|
end
|
|
else
|
|
param_k, param_v = param:match("^([^=]+)=(.+)$");
|
|
if not param_k then
|
|
if param:match("^no%-") then
|
|
param_k, param_v = param:sub(4), false;
|
|
else
|
|
param_k, param_v = param, true;
|
|
end
|
|
end
|
|
param_k = param_k:gsub("%-", "_");
|
|
if strict and not kv_params[param_k] then
|
|
return nil, "param-not-found", raw_param;
|
|
end
|
|
end
|
|
if array_params[uparam] then
|
|
if parsed_opts[param_k] then
|
|
table.insert(parsed_opts[param_k], param_v);
|
|
else
|
|
parsed_opts[param_k] = { param_v };
|
|
end
|
|
else
|
|
parsed_opts[param_k] = param_v;
|
|
end
|
|
elseif not stop_on_positional then
|
|
table.insert(parsed_opts, table.remove(arg, 1));
|
|
end
|
|
end
|
|
|
|
if stop_on_positional then
|
|
for i = 1, #arg do
|
|
parsed_opts[i] = arg[i];
|
|
end
|
|
end
|
|
|
|
return parsed_opts;
|
|
end
|
|
|
|
return {
|
|
parse = parse;
|
|
}
|