mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-01 20:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.argparse: Fix bug (regression?) in argument parsing with --foo=bar

Browse source 
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.
This commit is contained in:
Matthew Wild 2025-03-11 18:27:36 +00:00
parent afb9bc34a0
commit 06994f0bc1
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spec/util_argparse_spec.lua
View file

@ -54,6 +54,12 @@ describe("parse", function()
assert.same({ foo = "bar"; baz = "moo" }, opts);
end);
it("supports value arguments in strict mode", function()
local opts, err = parse({ "--foo"; "bar"; "--baz=moo" }, { strict = true, value_params = { foo = true; baz = true } });
assert.falsy(err);
assert.same({ foo = "bar"; baz = "moo" }, opts);
end);
it("demands values for value params", function()
local opts, err, where = parse({ "--foo" }, { value_params = { foo = true } });
assert.falsy(opts);

8
util/argparse.lua
View file

@ -39,9 +39,13 @@ local function parse(arg, config)
local param_k, param_v;
if value_params[uparam] or array_params[uparam] then
param_k, param_v = uparam, table.remove(arg, 1);
param_k = uparam;
param_v = param:match("^=(.*)$", #uparam+1);
if not param_v then
return nil, "missing-value", raw_param;
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("^([^=]+)=(.+)$");