RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

options: commandline: support "--no-opt" for flag options 

When parsing the command line, map "--no-foo" to "--foo=no" if an
option named "foo" exists and is a flag option. Non-empty parameters
are not allowed with this syntax ("--no-foo=no" is invalid).

This implementation is different from the existing "--nofoo" variants
for most flag options. Those are implemented as completely separate
options; there's an option named "fs" and a separate option named
"nofs" (thus "--no-nofs" actually works after this change...). The
reason for adding the new syntax is to support the much more standard
"--no-" prefix and to allow eventually cleaning up the option handling
(though the "nofoo" variants of existing options can't be removed soon
due to backwards compatibility).
This commit is contained in:
Uoti Urpala 2011-09-01 18:32:11 +03:00
parent b6628f4e1e
commit 081e2d0b7b
1 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
parser-mpcmd.c
View File

@ -68,6 +68,29 @@ static bool split_opt(struct bstr *opt, struct bstr *param, bool *old_syntax)
return true;
}
static int map_to_option(struct m_config *config, bool old_syntax,
const struct m_option **mp_opt,
struct bstr *optname, struct bstr *param)
{
if (!mp_opt)
mp_opt = &(const struct m_option *){0};
*mp_opt = m_config_get_option(config, *optname);
if (*mp_opt)
return 0;
if (!bstr_startswith0(*optname, "no-"))
return -1;
struct bstr s = bstr_cut(*optname, 3);
*mp_opt = m_config_get_option(config, s);
if (!*mp_opt || (*mp_opt)->type != &m_option_type_flag)
return -1;
if (param->len)
return -2;
if (old_syntax)
return -3;
*optname = s;
*param = bstr("no");
return 0;
}
// Parse command line to set up config and playtree
play_tree_t *m_config_parse_mp_command_line(m_config_t *config, int argc,
@ -172,11 +195,21 @@ play_tree_t *m_config_parse_mp_command_line(m_config_t *config, int argc,
} else {
// "normal" options
const struct m_option *mp_opt;
mp_opt = m_config_get_option(config, opt);
if (!mp_opt) {
mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,
"Unknown option on the command line: --%.*s\n",
BSTR_P(opt));
int ok = map_to_option(config, old_syntax, &mp_opt, &opt,
&param);
if (ok < 0) {
if (ok == -3)
mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,
"Option --%.*s can't be used with single-dash "
"syntax\n", BSTR_P(opt));
else if (ok == -2)
mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,
"A --no-* option can't take parameters: "
"--%.*s=%.*s\n", BSTR_P(opt), BSTR_P(param));
else
mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,
"Unknown option on the command line: --%.*s\n",
BSTR_P(opt));
goto print_err;
}
int r;
@ -295,7 +328,7 @@ int m_config_preparse_command_line(m_config_t *config, int argc, char **argv)
if (!split_opt(&opt, &param, &old_syntax))
continue; // Ignore non-option arguments
// Ignore invalid options
if (!m_config_get_option(config, opt))
if (map_to_option(config, old_syntax, NULL, &opt, &param) < 0)
continue;
// Set, non-pre-parse options will be ignored
int r = m_config_set_option(config, opt, param, old_syntax);