Major tidy up and rework of options tree and set-option/show-options

commands this pushes more of the code into options.c and ties it more
closely to the options table rather than having an unnecessary
split. Also add support for array options (will be used later). Only
(intentional) user visible change is that show-options output is now
passed through vis(3) with VIS_DQ so quotes are escaped.

1 files changed, 210 insertions, 378 deletions

diff --git a/cmd-set-option.c b/cmd-set-option.c
index ab15eb70..fc035acb 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -29,41 +29,15 @@
 
 static enum cmd_retval	cmd_set_option_exec(struct cmd *, struct cmdq_item *);
 
-static enum cmd_retval	cmd_set_option_user(struct cmd *, struct cmdq_item *,
-			    const char *, const char *);
-
-static int	cmd_set_option_unset(struct cmd *, struct cmdq_item *,
+static int	cmd_set_option_set(struct cmd *, struct cmdq_item *,
+		    struct options *, struct option *, const char *);
+static int	cmd_set_option_flag(struct cmdq_item *,
 		    const struct options_table_entry *, struct options *,
 		    const char *);
-static int	cmd_set_option_set(struct cmd *, struct cmdq_item *,
+static int	cmd_set_option_choice(struct cmdq_item *,
 		    const struct options_table_entry *, struct options *,
 		    const char *);
 
-static struct options_entry *cmd_set_option_string(struct cmd *,
-	    struct cmdq_item *, const struct options_table_entry *,
-	    struct options *, const char *);
-static struct options_entry *cmd_set_option_number(struct cmd *,
-	    struct cmdq_item *, const struct options_table_entry *,
-	    struct options *, const char *);
-static struct options_entry *cmd_set_option_key(struct cmd *,
-	    struct cmdq_item *, const struct options_table_entry *,
-	    struct options *, const char *);
-static struct options_entry *cmd_set_option_colour(struct cmd *,
-	    struct cmdq_item *, const struct options_table_entry *,
-	    struct options *, const char *);
-static struct options_entry *cmd_set_option_attributes(struct cmd *,
-	    struct cmdq_item *, const struct options_table_entry *,
-	    struct options *, const char *);
-static struct options_entry *cmd_set_option_flag(struct cmd *,
-	    struct cmdq_item *, const struct options_table_entry *,
-	    struct options *, const char *);
-static struct options_entry *cmd_set_option_choice(struct cmd *,
-	    struct cmdq_item *, const struct options_table_entry *,
-	    struct options *, const char *);
-static struct options_entry *cmd_set_option_style(struct cmd *,
-	    struct cmdq_item *, const struct options_table_entry *,
-	    struct options *, const char *);
-
 const struct cmd_entry cmd_set_option_entry = {
 	.name = "set-option",
 	.alias = "set",
@@ -93,99 +67,150 @@ const struct cmd_entry cmd_set_window_option_entry = {
 static enum cmd_retval
 cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
 {
-	struct args				*args = self->args;
-	struct session				*s = item->state.tflag.s;
-	struct winlink				*wl = item->state.tflag.wl;
-	struct window				*w;
-	struct client				*c;
-	const struct options_table_entry	*oe;
-	struct options				*oo;
-	const char				*optstr, *valstr, *target;
-
-	/* Get the option name and value. */
-	optstr = args->argv[0];
-	if (*optstr == '\0') {
-		cmdq_error(item, "invalid option");
+	struct args			*args = self->args;
+	struct cmd_find_state		*fs = &item->state.tflag;
+	struct session			*s = fs->s;
+	struct winlink			*wl = fs->wl;
+	struct window			*w = wl->window;
+	struct client			*c;
+	enum options_table_scope	 scope;
+	struct options			*oo;
+	struct option			*parent, *o;
+	const char			*name, *value, *target;
+	int				 window, idx, already, error, ambiguous;
+	char				*cause;
+
+	/* Parse option name and index. */
+	name = options_match(args->argv[0], &idx, &ambiguous);
+	if (name == NULL) {
+		if (ambiguous)
+			cmdq_error(item, "ambiguous option: %s", args->argv[0]);
+		else
+			cmdq_error(item, "invalid option: %s", args->argv[0]);
 		return (CMD_RETURN_ERROR);
 	}
 	if (args->argc < 2)
-		valstr = NULL;
+		value = NULL;
 	else
-		valstr = args->argv[1];
-
-	/* Is this a user option? */
-	if (*optstr == '@')
-		return (cmd_set_option_user(self, item, optstr, valstr));
-
-	/* Find the option entry. */
-	oe = NULL;
-	if (options_table_find(optstr, &oe) != 0) {
-		if (!args_has(args, 'q')) {
-			cmdq_error(item, "ambiguous option: %s", optstr);
-			return (CMD_RETURN_ERROR);
+		value = args->argv[1];
+
+	/*
+	 * Figure out the scope: for user options it comes from the arguments,
+	 * otherwise from the option name.
+	 */
+	if (*name == '@') {
+		window = (self->entry == &cmd_set_window_option_entry);
+		scope = options_scope_from_flags(args, window, fs, &oo, &cause);
+	} else {
+		if (options_get_only(global_options, name) != NULL)
+			scope = OPTIONS_TABLE_SERVER;
+		else if (options_get_only(global_s_options, name) != NULL)
+			scope = OPTIONS_TABLE_SESSION;
+		else if (options_get_only(global_w_options, name) != NULL)
+			scope = OPTIONS_TABLE_WINDOW;
+		else {
+			scope = OPTIONS_TABLE_NONE;
+			xasprintf(&cause, "unknown option: %s", args->argv[0]);
 		}
-		return (CMD_RETURN_NORMAL);
 	}
-	if (oe == NULL) {
-		if (!args_has(args, 'q')) {
-			cmdq_error(item, "unknown option: %s", optstr);
-			return (CMD_RETURN_ERROR);
-		}
-		return (CMD_RETURN_NORMAL);
+	if (scope == OPTIONS_TABLE_NONE) {
+		cmdq_error(item, "%s", cause);
+		free(cause);
+		return (CMD_RETURN_ERROR);
 	}
 
-	/* Work out the tree from the scope of the option. */
-	if (oe->scope == OPTIONS_TABLE_SERVER)
+	/* Which table should this option go into? */
+	if (scope == OPTIONS_TABLE_SERVER)
 		oo = global_options;
-	else if (oe->scope == OPTIONS_TABLE_WINDOW) {
+	else if (scope == OPTIONS_TABLE_SESSION) {
+		if (args_has(self->args, 'g'))
+			oo = global_s_options;
+		else if (s == NULL) {
+			target = args_get(args, 't');
+			if (target != NULL)
+				cmdq_error(item, "no such session: %s", target);
+			else
+				cmdq_error(item, "no current session");
+			return (CMD_RETURN_ERROR);
+		} else
+			oo = s->options;
+	} else if (scope == OPTIONS_TABLE_WINDOW) {
 		if (args_has(self->args, 'g'))
 			oo = global_w_options;
 		else if (wl == NULL) {
 			target = args_get(args, 't');
-			if (target != NULL) {
-				cmdq_error(item, "no such window: %s",
-				    target);
-			} else
+			if (target != NULL)
+				cmdq_error(item, "no such window: %s", target);
+			else
 				cmdq_error(item, "no current window");
 			return (CMD_RETURN_ERROR);
 		} else
 			oo = wl->window->options;
-	} else if (oe->scope == OPTIONS_TABLE_SESSION) {
-		if (args_has(self->args, 'g'))
-			oo = global_s_options;
-		else if (s == NULL) {
-			target = args_get(args, 't');
-			if (target != NULL) {
-				cmdq_error(item, "no such session: %s",
-				    target);
-			} else
-				cmdq_error(item, "no current session");
+	}
+	o = options_get_only(oo, name);
+	parent = options_get(oo, name);
+
+	/* Check that array options and indexes match up. */
+	if (idx != -1) {
+		if (*name == '@' || options_array_size(parent, NULL) == -1) {
+			cmdq_error(item, "not an array: %s", args->argv[0]);
 			return (CMD_RETURN_ERROR);
-		} else
-			oo = s->options;
+		}
 	} else {
-		cmdq_error(item, "unknown table");
-		return (CMD_RETURN_ERROR);
+		if (*name != '@' && options_array_size(parent, NULL) != -1) {
+			cmdq_error(item, "is an array: %s", args->argv[0]);
+			return (CMD_RETURN_ERROR);
+		}
 	}
 
-	/* Unset or set the option. */
+	/* With -o, check this option is not already set. */
+	if (!args_has(args, 'u') && args_has(args, 'o')) {
+		if (idx == -1)
+			already = (o != NULL);
+		else {
+			if (o == NULL)
+				already = 0;
+			else
+				already = (options_array_get(o, idx) != NULL);
+		}
+		if (already) {
+			if (args_has(args, 'q'))
+				return (CMD_RETURN_NORMAL);
+			cmdq_error(item, "already set: %s", args->argv[0]);
+			return (CMD_RETURN_ERROR);
+		}
+	}
+
+	/* Change the option. */
 	if (args_has(args, 'u')) {
-		if (cmd_set_option_unset(self, item, oe, oo, valstr) != 0)
+		if (o == NULL)
+			return (CMD_RETURN_NORMAL);
+		if (idx == -1) {
+			if (oo == global_options ||
+			    oo == global_s_options ||
+			    oo == global_w_options)
+				options_default(oo, options_table_entry(o));
+			else
+				options_remove(o);
+		} else
+			options_array_set(o, idx, NULL);
+	} else if (*name == '@')
+		options_set_string(oo, name, args_has(args, 'a'), "%s", value);
+	else if (idx == -1) {
+		error = cmd_set_option_set(self, item, oo, parent, value);
+		if (error != 0)
 			return (CMD_RETURN_ERROR);
 	} else {
-		if (args_has(args, 'o') && options_find1(oo, optstr) != NULL) {
-			if (!args_has(args, 'q')) {
-				cmdq_error(item, "already set: %s", optstr);
-				return (CMD_RETURN_ERROR);
-			}
-			return (CMD_RETURN_NORMAL);
-		}
-		if (cmd_set_option_set(self, item, oe, oo, valstr) != 0)
+		if (o == NULL)
+			o = options_empty(oo, options_table_entry(parent));
+		if (options_array_set(o, idx, value) != 0) {
+			cmdq_error(item, "invalid index: %s", args->argv[0]);
 			return (CMD_RETURN_ERROR);
+		}
 	}
 
 	/* Update timers and so on for various options. */
-	if (strcmp(oe->name, "automatic-rename") == 0) {
+	if (strcmp(name, "automatic-rename") == 0) {
 		RB_FOREACH(w, windows, &windows) {
 			if (w->active == NULL)
 				continue;
@@ -193,26 +218,29 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
 				w->active->flags |= PANE_CHANGED;
 		}
 	}
-	if (strcmp(oe->name, "key-table") == 0) {
+	if (strcmp(name, "key-table") == 0) {
 		TAILQ_FOREACH(c, &clients, entry)
 			server_client_set_key_table(c, NULL);
 	}
-	if (strcmp(oe->name, "status") == 0 ||
-	    strcmp(oe->name, "status-interval") == 0)
+	if (strcmp(name, "status") == 0 ||
+	    strcmp(name, "status-interval") == 0)
 		status_timer_start_all();
-	if (strcmp(oe->name, "monitor-silence") == 0)
+	if (strcmp(name, "monitor-silence") == 0)
 		alerts_reset_all();
-	if (strcmp(oe->name, "window-style") == 0 ||
-	    strcmp(oe->name, "window-active-style") == 0) {
+	if (strcmp(name, "window-style") == 0 ||
+	    strcmp(name, "window-active-style") == 0) {
 		RB_FOREACH(w, windows, &windows)
 			w->flags |= WINDOW_STYLECHANGED;
 	}
-	if (strcmp(oe->name, "pane-border-status") == 0) {
+	if (strcmp(name, "pane-border-status") == 0) {
 		RB_FOREACH(w, windows, &windows)
 			layout_fix_panes(w, w->sx, w->sy);
 	}
 
-	/* Update sizes and redraw. May not need it but meh. */
+	/*
+	 * Update sizes and redraw. May not always be necessary but do it
+	 * anyway.
+	 */
 	recalculate_sizes();
 	TAILQ_FOREACH(c, &clients, entry) {
 		if (c->session != NULL)
@@ -222,250 +250,82 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
 	return (CMD_RETURN_NORMAL);
 }
 
-/* Set user option. */
-static enum cmd_retval
-cmd_set_option_user(struct cmd *self, struct cmdq_item *item,
-    const char *optstr, const char *valstr)
-{
-	struct args		*args = self->args;
-	struct session		*s = item->state.tflag.s;
-	struct winlink		*wl = item->state.tflag.wl;
-	struct options		*oo;
-	struct options_entry	*o;
-	const char		*target;
-
-	if (args_has(args, 's'))
-		oo = global_options;
-	else if (args_has(self->args, 'w') ||
-	    self->entry == &cmd_set_window_option_entry) {
-		if (args_has(self->args, 'g'))
-			oo = global_w_options;
-		else if (wl == NULL) {
-			target = args_get(args, 't');
-			if (target != NULL) {
-				cmdq_error(item, "no such window: %s",
-				    target);
-			} else
-				cmdq_error(item, "no current window");
-			return (CMD_RETURN_ERROR);
-		} else
-			oo = wl->window->options;
-	} else {
-		if (args_has(self->args, 'g'))
-			oo = global_s_options;
-		else if (s == NULL) {
-			target = args_get(args, 't');
-			if (target != NULL) {
-				cmdq_error(item, "no such session: %s",
-				    target);
-			} else
-				cmdq_error(item, "no current session");
-			return (CMD_RETURN_ERROR);
-		} else
-			oo = s->options;
-	}
-
-	if (args_has(args, 'u')) {
-		if (options_find1(oo, optstr) == NULL) {
-			if (!args_has(args, 'q')) {
-				cmdq_error(item, "unknown option: %s", optstr);
-				return (CMD_RETURN_ERROR);
-			}
-			return (CMD_RETURN_NORMAL);
-		}
-		if (valstr != NULL) {
-			cmdq_error(item, "value passed to unset option: %s",
-			    optstr);
-			return (CMD_RETURN_ERROR);
-		}
-		options_remove(oo, optstr);
-	} else {
-		o = options_find1(oo, optstr);
-		if (args_has(args, 'o') && o != NULL) {
-			if (!args_has(args, 'q')) {
-				cmdq_error(item, "already set: %s", optstr);
-				return (CMD_RETURN_ERROR);
-			}
-			return (CMD_RETURN_NORMAL);
-		}
-		if (valstr == NULL) {
-			cmdq_error(item, "empty value");
-			return (CMD_RETURN_ERROR);
-		}
-		options_set_string(oo, optstr, args_has(args, 'a'), "%s",
-		    valstr);
-	}
-	return (CMD_RETURN_NORMAL);
-}
-
-/* Unset an option. */
 static int
-cmd_set_option_unset(struct cmd *self, struct cmdq_item *item,
-    const struct options_table_entry *oe, struct options *oo,
-    const char *value)
+cmd_set_option_set(struct cmd *self, struct cmdq_item *item, struct options *oo,
+    struct option *parent, const char *value)
 {
-	struct args	*args = self->args;
-
-	if (value != NULL) {
-		cmdq_error(item, "value passed to unset option: %s", oe->name);
+	const struct options_table_entry	*oe;
+	struct args				*args = self->args;
+	int					 append = args_has(args, 'a');
+	struct option				*o;
+	long long				 number;
+	const char				*errstr;
+	key_code				 key;
+
+	oe = options_table_entry(parent);
+	if (value == NULL &&
+	    oe->type != OPTIONS_TABLE_FLAG &&
+	    oe->type != OPTIONS_TABLE_CHOICE) {
+		cmdq_error(item, "empty value");
 		return (-1);
 	}
 
-	if (args_has(args, 'g') || oo == global_options) {
-		switch (oe->type) {
-		case OPTIONS_TABLE_STRING:
-			options_set_string(oo, oe->name, 0, "%s",
-			    oe->default_str);
-			break;
-		case OPTIONS_TABLE_STYLE:
-			options_set_style(oo, oe->name, 0, oe->default_str);
-			break;
-		default:
-			options_set_number(oo, oe->name, oe->default_num);
-			break;
-		}
-	} else
-		options_remove(oo, oe->name);
-	return (0);
-}
-
-/* Set an option. */
-static int
-cmd_set_option_set(struct cmd *self, struct cmdq_item *item,
-    const struct options_table_entry *oe, struct options *oo,
-    const char *value)
-{
-	struct options_entry	*o;
-
-	switch (oe->type) {
-	case OPTIONS_TABLE_FLAG:
-	case OPTIONS_TABLE_CHOICE:
-		break;
-	default:
-		if (value == NULL) {
-			cmdq_error(item, "empty value");
-			return (-1);
-		}
-	}
-
-	o = NULL;
 	switch (oe->type) {
 	case OPTIONS_TABLE_STRING:
-		o = cmd_set_option_string(self, item, oe, oo, value);
-		break;
+		options_set_string(oo, oe->name, append, "%s", value);
+		return (0);
 	case OPTIONS_TABLE_NUMBER:
-		o = cmd_set_option_number(self, item, oe, oo, value);
-		break;
+		number = strtonum(value, oe->minimum, oe->maximum, &errstr);
+		if (errstr != NULL) {
+			cmdq_error(item, "value is %s: %s", errstr, value);
+			return (-1);
+		}
+		options_set_number(oo, oe->name, number);
+		return (0);
 	case OPTIONS_TABLE_KEY:
-		o = cmd_set_option_key(self, item, oe, oo, value);
-		break;
+		key = key_string_lookup_string(value);
+		if (key == KEYC_UNKNOWN) {
+			cmdq_error(item, "bad key: %s", value);
+			return (-1);
+		}
+		options_set_number(oo, oe->name, key);
+		return (0);
 	case OPTIONS_TABLE_COLOUR:
-		o = cmd_set_option_colour(self, item, oe, oo, value);
-		if (o != NULL)
-			style_update_new(oo, o->name, oe->style);
-		break;
+		if ((number = colour_fromstring(value)) == -1) {
+			cmdq_error(item, "bad colour: %s", value);
+			return (-1);
+		}
+		o = options_set_number(oo, oe->name, number);
+		options_style_update_new(oo, o);
+		return (0);
 	case OPTIONS_TABLE_ATTRIBUTES:
-		o = cmd_set_option_attributes(self, item, oe, oo, value);
-		if (o != NULL)
-			style_update_new(oo, o->name, oe->style);
-		break;
+		if ((number = attributes_fromstring(value)) == -1) {
+			cmdq_error(item, "bad attributes: %s", value);
+			return (-1);
+		}
+		o = options_set_number(oo, oe->name, number);
+		options_style_update_new(oo, o);
+		return (0);
 	case OPTIONS_TABLE_FLAG:
-		o = cmd_set_option_flag(self, item, oe, oo, value);
-		break;
+		return (cmd_set_option_flag(item, oe, oo, value));
 	case OPTIONS_TABLE_CHOICE:
-		o = cmd_set_option_choice(self, item, oe, oo, value);
-		break;
+		return (cmd_set_option_choice(item, oe, oo, value));
 	case OPTIONS_TABLE_STYLE:
-		o = cmd_set_option_style(self, item, oe, oo, value);
+		o = options_set_style(oo, oe->name, append, value);
+		if (o == NULL) {
+			cmdq_error(item, "bad style: %s", value);
+			return (-1);
+		}
+		options_style_update_old(oo, o);
+		return (0);
+	case OPTIONS_TABLE_ARRAY:
 		break;
 	}
-	if (o == NULL)
-		return (-1);
-	return (0);
+	return (-1);
 }
 
-/* Set a string option. */
-static struct options_entry *
-cmd_set_option_string(struct cmd *self, __unused struct cmdq_item *item,
-    const struct options_table_entry *oe, struct options *oo,
-    const char *value)
-{
-	struct args	*args = self->args;
-	int		 append = args_has(args, 'a');
-
-	return (options_set_string(oo, oe->name, append, "%s", value));
-}
-
-/* Set a number option. */
-static struct options_entry *
-cmd_set_option_number(__unused struct cmd *self, struct cmdq_item *item,
-    const struct options_table_entry *oe, struct options *oo,
-    const char *value)
-{
-	long long	 ll;
-	const char     	*errstr;
-
-	ll = strtonum(value, oe->minimum, oe->maximum, &errstr);
-	if (errstr != NULL) {
-		cmdq_error(item, "value is %s: %s", errstr, value);
-		return (NULL);
-	}
-
-	return (options_set_number(oo, oe->name, ll));
-}
-
-/* Set a key option. */
-static struct options_entry *
-cmd_set_option_key(__unused struct cmd *self, struct cmdq_item *item,
-    const struct options_table_entry *oe, struct options *oo,
-    const char *value)
-{
-	key_code	key;
-
-	key = key_string_lookup_string(value);
-	if (key == KEYC_UNKNOWN) {
-		cmdq_error(item, "bad key: %s", value);
-		return (NULL);
-	}
-
-	return (options_set_number(oo, oe->name, key));
-}
-
-/* Set a colour option. */
-static struct options_entry *
-cmd_set_option_colour(__unused struct cmd *self, struct cmdq_item *item,
-    const struct options_table_entry *oe, struct options *oo,
-    const char *value)
-{
-	int	colour;
-
-	if ((colour = colour_fromstring(value)) == -1) {
-		cmdq_error(item, "bad colour: %s", value);
-		return (NULL);
-	}
-
-	return (options_set_number(oo, oe->name, colour));
-}
-
-/* Set an attributes option. */
-static struct options_entry *
-cmd_set_option_attributes(__unused struct cmd *self, struct cmdq_item *item,
-    const struct options_table_entry *oe, struct options *oo,
-    const char *value)
-{
-	int	attr;
-
-	if ((attr = attributes_fromstring(value)) == -1) {
-		cmdq_error(item, "bad attributes: %s", value);
-		return (NULL);
-	}
-
-	return (options_set_number(oo, oe->name, attr));
-}
-
-/* Set a flag option. */
-static struct options_entry *
-cmd_set_option_flag(__unused struct cmd *self, struct cmdq_item *item,
+static int
+cmd_set_option_flag(struct cmdq_item *item,
     const struct options_table_entry *oe, struct options *oo,
     const char *value)
 {
@@ -473,31 +333,28 @@ cmd_set_option_flag(__unused struct cmd *self, struct cmdq_item *item,
 
 	if (value == NULL || *value == '\0')
 		flag = !options_get_number(oo, oe->name);
+	else if (strcmp(value, "1") == 0 ||
+	    strcasecmp(value, "on") == 0 ||
+	    strcasecmp(value, "yes") == 0)
+		flag = 1;
+	else if (strcmp(value, "0") == 0 ||
+	    strcasecmp(value, "off") == 0 ||
+	    strcasecmp(value, "no") == 0)
+		flag = 0;
 	else {
-		if ((value[0] == '1' && value[1] == '\0') ||
-		    strcasecmp(value, "on") == 0 ||
-		    strcasecmp(value, "yes") == 0)
-			flag = 1;
-		else if ((value[0] == '0' && value[1] == '\0') ||
-		    strcasecmp(value, "off") == 0 ||
-		    strcasecmp(value, "no") == 0)
-			flag = 0;
-		else {
-			cmdq_error(item, "bad value: %s", value);
-			return (NULL);
-		}
+		cmdq_error(item, "bad value: %s", value);
+		return (-1);
 	}
-
-	return (options_set_number(oo, oe->name, flag));
+	options_set_number(oo, oe->name, flag);
+	return (0);
 }
 
-/* Set a choice option. */
-static struct options_entry *
-cmd_set_option_choice(__unused struct cmd *self, struct cmdq_item *item,
+static int
+cmd_set_option_choice(struct cmdq_item *item,
     const struct options_table_entry *oe, struct options *oo,
     const char *value)
 {
-	const char	**choicep;
+	const char	**cp;
 	int		  n, choice = -1;
 
 	if (value == NULL) {
@@ -506,41 +363,16 @@ cmd_set_option_choice(__unused struct cmd *self, struct cmdq_item *item,
 			choice = !choice;
 	} else {
 		n = 0;
-		for (choicep = oe->choices; *choicep != NULL; choicep++) {
+		for (cp = oe->choices; *cp != NULL; cp++) {
+			if (strcmp(*cp, value) == 0)
+				choice = n;
 			n++;
-			if (strncmp(*choicep, value, strlen(value)) != 0)
-				continue;
-
-			if (choice != -1) {
-				cmdq_error(item, "ambiguous value: %s", value);
-				return (NULL);
-			}
-			choice = n - 1;
 		}
 		if (choice == -1) {
 			cmdq_error(item, "unknown value: %s", value);
-			return (NULL);
+			return (-1);
 		}
 	}
-
-	return (options_set_number(oo, oe->name, choice));
-}
-
-/* Set a style option. */
-static struct options_entry *
-cmd_set_option_style(struct cmd *self, struct cmdq_item *item,
-    const struct options_table_entry *oe, struct options *oo,
-    const char *value)
-{
-	struct args		*args = self->args;
-	int			 append = args_has(args, 'a');
-	struct options_entry	*o;
-
-	if ((o = options_set_style(oo, oe->name, append, value)) == NULL) {
-		cmdq_error(item, "bad style: %s", value);
-		return (NULL);
-	}
-
-	style_update_old(oo, oe->name, &o->style);
-	return (o);
+	options_set_number(oo, oe->name, choice);
+	return (0);
 }