diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-07-28 22:55:15 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-07-29 05:50:38 +0300 |
| commit | 0010ffefc49e57551bf2098082136ffddf6e4445 (patch) | |
| tree | 3dae8c7cc28d74f495ea4435377267d9c5e227a8 /parser-mpcmd.c | |
| parent | f25accbc510b641ac75a1f274376616417763ae5 (diff) | |
| download | mpv-0010ffefc49e57551bf2098082136ffddf6e4445.tar.bz2 mpv-0010ffefc49e57551bf2098082136ffddf6e4445.tar.xz | |
options: commandline: allow "--" without filenames after it
A "--" argument on the command line is used to indicate that all
following arguments should be interpreted as filenames, not options.
Specifying it as the last argument was considered an error. I see no
particular reason to forbid the following filename list to be empty,
nor do other programs with similar functionalitly I know about treat
it that way. So just ignore a "--" with no more arguments.
Diffstat (limited to 'parser-mpcmd.c')
| -rw-r--r-- | parser-mpcmd.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/parser-mpcmd.c b/parser-mpcmd.c index 52de313e71..343e9a5a84 100644 --- a/parser-mpcmd.c +++ b/parser-mpcmd.c @@ -76,7 +76,7 @@ play_tree_t *m_config_parse_mp_command_line(m_config_t *config, int argc, int i, j, start_title = -1, end_title = -1; char *opt, *splitpos = NULL; char entbuf[15]; - int no_more_opts = 0; + bool no_more_opts = false; int opt_exit = 0; // whether mplayer should exit without playing anything play_tree_t *last_parent, *last_entry = NULL, *root; @@ -99,13 +99,7 @@ play_tree_t *m_config_parse_mp_command_line(m_config_t *config, int argc, opt = argv[i]; /* check for -- (no more options id.) except --help! */ if (!strcmp(opt, "--")) { - no_more_opts = 1; - if (i + 1 >= argc) { - mp_tmsg(MSGT_CFGPARSER, MSGL_ERR, - "'--' indicates no more options, " - "but no filename was given on the command line.\n"); - goto err_out; - } + no_more_opts = true; continue; } if ((opt[0] == '{') && (opt[1] == '\0')) { |