From 78ebb3c6fa637206bb369349ba93328b36895e2b Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 22 Jul 2013 23:06:22 +0200 Subject: options: make legacy hacks for AFs/VFs more explicit This means that AOs/VOs with no options set do not take the legacy option parsing path, but instead report that they have no options. --- core/m_option.c | 2 +- core/m_option.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/m_option.c b/core/m_option.c index 4ee8ba97ad..02258416ec 100644 --- a/core/m_option.c +++ b/core/m_option.c @@ -2140,7 +2140,7 @@ static int parse_obj_settings(struct bstr opt, struct bstr *pstr, } if (has_param) { - if (!desc.options) { + if (!desc.options && list->legacy_hacks) { // Should perhaps be parsed as escape-able string. But this is a // compatibility path, so it's not worth the trouble. int next = bstrcspn(*pstr, ","); diff --git a/core/m_option.h b/core/m_option.h index 73f3fabee8..9cd5202b90 100644 --- a/core/m_option.h +++ b/core/m_option.h @@ -125,6 +125,8 @@ struct m_obj_list { // Allow unknown entries, for which a dummy entry is inserted, and whose // options are skipped and ignored. bool allow_unknown_entries; + // If object has no options set, assume it parses options on its own. + bool legacy_hacks; }; // Find entry by name -- cgit v1.2.3