Software /
code /
prosody
Diff
util/argparse.lua @ 13762:81856814d74f 13.0
util.argparse: Fix bug (regression?) in argument parsing with --foo=bar
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.
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Tue, 11 Mar 2025 18:27:36 +0000 |
parent | 13733:48c056c10e5a |
line wrap: on
line diff
--- a/util/argparse.lua Mon Mar 10 11:54:52 2025 +0000 +++ b/util/argparse.lua Tue Mar 11 18:27:36 2025 +0000 @@ -39,9 +39,13 @@ 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("^([^=]+)=(.+)$");