From 06994f0bc145ebf61b7906a715f61f22a70cbe57 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 11 Mar 2025 18:27:36 +0000 Subject: 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. --- util/argparse.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'util') diff --git a/util/argparse.lua b/util/argparse.lua index 3a7d1ba2..75b1c2f9 100644 --- a/util/argparse.lua +++ b/util/argparse.lua @@ -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("^([^=]+)=(.+)$"); -- cgit v1.2.3