From e8b33af780d8b9622de422cbcd4f82a47ccd0c6e Mon Sep 17 00:00:00 2001 From: nicm Date: Fri, 15 Mar 2019 21:54:47 +0000 Subject: Add a way to set individual defaults for an array option. --- options.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'options.c') diff --git a/options.c b/options.c index 08d9275f..9ea5c118 100644 --- a/options.c +++ b/options.c @@ -169,12 +169,17 @@ options_empty(struct options *oo, const struct options_table_entry *oe) struct options_entry * options_default(struct options *oo, const struct options_table_entry *oe) { - struct options_entry *o; + struct options_entry *o; + u_int i; o = options_empty(oo, oe); - if (oe->type == OPTIONS_TABLE_ARRAY) - options_array_assign(o, oe->default_str); - else if (oe->type == OPTIONS_TABLE_STRING) + if (oe->type == OPTIONS_TABLE_ARRAY) { + if (oe->default_arr != NULL) { + for (i = 0; oe->default_arr[i] != NULL; i++) + options_array_set(o, i, oe->default_arr[i], 0); + } else + options_array_assign(o, oe->default_str); + } else if (oe->type == OPTIONS_TABLE_STRING) o->string = xstrdup(oe->default_str); else if (oe->type == OPTIONS_TABLE_STYLE) { style_set(&o->style, &grid_default_cell); -- cgit v1.2.3