From 761975d47b4e8536df837f999642430d19087b79 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 24 Feb 2014 23:02:20 +0100 Subject: command: fix loadfile command This was broken by commit bb6b543812a724. Note that the original pull request was fine, but it was broken by my own stupidity when I was "improving" it. The problem is that the new loadfile argument was not considered optional anymore after my changes. The original pull request did handle this by setting .defval to a dummy value, but I removed that part. Fix it again by introducing a flag that designates that the parameter is optional. (I didn't want to add it to m_option.h, because technically, all options are optional, and it's not possible to have non-optional options.) --- input/cmd_parse.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'input/cmd_parse.c') diff --git a/input/cmd_parse.c b/input/cmd_parse.c index e2296ce215..64b23ac05f 100644 --- a/input/cmd_parse.c +++ b/input/cmd_parse.c @@ -199,10 +199,11 @@ static struct mp_cmd *parse_cmd(struct parse_ctx *ctx, int def_flags) if (is_vararg) continue; // Skip optional arguments - if (opt->defval) { + if (opt->defval || (opt->flags & MP_CMD_OPT_ARG)) { struct mp_cmd_arg *cmdarg = &cmd->args[cmd->nargs]; cmdarg->type = opt; - m_option_copy(opt, &cmdarg->v, opt->defval); + if (opt->defval) + m_option_copy(opt, &cmdarg->v, opt->defval); cmd->nargs++; continue; } -- cgit v1.2.3