Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-01-24 20:01:12 +00:00
4 changed files with 79 additions and 43 deletions

View File

@ -91,11 +91,20 @@ cmd_show_options_print(struct cmd *self, struct cmdq_item *item,
const char *name;
const char *value;
char *tmp, *escaped;
u_int size, i;
if (idx != -1) {
xasprintf(&tmp, "%s[%d]", options_name(o), idx);
name = tmp;
} else {
if (options_array_size(o, &size) != -1) {
for (i = 0; i < size; i++) {
if (options_array_get(o, i) == NULL)
continue;
cmd_show_options_print(self, item, o, i);
}
return;
}
tmp = NULL;
name = options_name(o);
}