From 48970cd485bf2811d1bbfcd69de55ff4f9c412e2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 23 Jun 2017 20:23:51 +0200 Subject: options: unbreak -h Sure is a simple thing to break. --- options/m_option.c | 2 ++ options/m_option.h | 3 +++ options/options.c | 8 ++++---- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'options') diff --git a/options/m_option.c b/options/m_option.c index bec2518b45..7e35153c84 100644 --- a/options/m_option.c +++ b/options/m_option.c @@ -77,6 +77,8 @@ int m_option_required_params(const m_option_t *opt) { if (opt->type->flags & M_OPT_TYPE_OPTIONAL_PARAM) return 0; + if (opt->flags & M_OPT_OPTIONAL_PARAM) + return 0; if (opt->type == &m_option_type_choice) { struct m_opt_choice_alternatives *alt; for (alt = opt->priv; alt->name; alt++) { diff --git a/options/m_option.h b/options/m_option.h index 78db2b5c85..8b5f477f0d 100644 --- a/options/m_option.h +++ b/options/m_option.h @@ -402,6 +402,9 @@ struct m_option { #define UPDATE_OPTS_MASK \ (((UPDATE_OPT_LAST << 1) - 1) & ~(unsigned)(UPDATE_OPT_FIRST - 1)) +// Like M_OPT_TYPE_OPTIONAL_PARAM. +#define M_OPT_OPTIONAL_PARAM (1 << 30) + // These are kept for compatibility with older code. #define CONF_MIN M_OPT_MIN #define CONF_MAX M_OPT_MAX diff --git a/options/options.c b/options/options.c index cacdcdfb17..620cc67318 100644 --- a/options/options.c +++ b/options/options.c @@ -244,10 +244,10 @@ const m_option_t mp_opts[] = { .offset = -1}, OPT_FLAG("list-properties", property_print_help, CONF_NOCFG | M_OPT_FIXED | M_OPT_NOPROP), - { "help", CONF_TYPE_STRING, CONF_NOCFG | M_OPT_FIXED | M_OPT_NOPROP, - .offset = -1}, - { "h", CONF_TYPE_STRING, CONF_NOCFG | M_OPT_FIXED | M_OPT_NOPROP, - .offset = -1}, + { "help", CONF_TYPE_STRING, CONF_NOCFG | M_OPT_FIXED | M_OPT_NOPROP | + M_OPT_OPTIONAL_PARAM, .offset = -1}, + { "h", CONF_TYPE_STRING, CONF_NOCFG | M_OPT_FIXED | M_OPT_NOPROP | + M_OPT_OPTIONAL_PARAM, .offset = -1}, OPT_PRINT("list-protocols", stream_print_proto_list), OPT_PRINT("version", print_version), -- cgit v1.2.3