github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-14 22:48:35 +01:00
Code Releases Activity

Revert "parse_commandline: fail gracefully on bad args"

Browse Source 
This reverts commit 38b05daf7d.

There was actually no LGPL relicensing agreement with wd0.
This commit is contained in:
wm4 2017-06-24 11:32:40 +02:00
parent f8cc184134
commit 933db1b95f
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
options/m_option.c
View File

@ -62,7 +62,7 @@ char *m_option_strerror(int code)
case M_OPT_MISSING_PARAM:
return "option requires parameter";
case M_OPT_INVALID:
return "option could not be parsed";
return "option parameter could not be parsed";
case M_OPT_OUT_OF_RANGE:
return "parameter is outside values allowed for option";
case M_OPT_DISALLOW_PARAM:

7
options/parse_commandline.c
View File

@ -78,9 +78,6 @@ static int split_opt_silent(struct parse_state *p)
bool ambiguous = !bstr_split_tok(p->arg, "=", &p->arg, &p->param);
if (!p->arg.len)
return M_OPT_INVALID;
bool need_param = m_config_option_requires_param(p->config, p->arg) > 0;
if (ambiguous && need_param) {
@ -101,7 +98,7 @@ static bool split_opt(struct parse_state *p)
return r == 0;
p->error = true;
MP_FATAL(p->config, "Error parsing command line option '%.*s': %s\n",
MP_FATAL(p->config, "Error parsing commandline option %.*s: %s\n",
BSTR_P(p->arg), m_option_strerror(r));
return false;
}
@ -154,7 +151,7 @@ int m_config_parse_mp_command_line(m_config_t *config, struct playlist *files,
ret = r;
goto err_out;
} else if (r < 0) {
MP_FATAL(config, "Setting command line option '--%.*s=%.*s' failed.\n",
MP_FATAL(config, "Setting commandline option --%.*s=%.*s failed.\n",
BSTR_P(p.arg), BSTR_P(p.param));
goto err_out;
}