summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/options.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2017-01-18 08:40:50 +0000
committernicm <nicm@openbsd.org>2017-01-18 08:40:50 +0000
commit351a56132c1320837b917ba4a00f5c890233624a (patch)
tree8b1a246e12d06204f82c622384a6581cf8aae9da /usr.bin/tmux/options.c
parenti386 version of a fix that went in for amd64 previously (diff)
downloadwireguard-openbsd-351a56132c1320837b917ba4a00f5c890233624a.tar.xz
wireguard-openbsd-351a56132c1320837b917ba4a00f5c890233624a.zip
options_match needs to explicitly check for user options.
Diffstat (limited to 'usr.bin/tmux/options.c')
-rw-r--r--usr.bin/tmux/options.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/usr.bin/tmux/options.c b/usr.bin/tmux/options.c
index a70db4e9201..9abee080e6a 100644
--- a/usr.bin/tmux/options.c
+++ b/usr.bin/tmux/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.28 2017/01/16 23:45:08 nicm Exp $ */
+/* $OpenBSD: options.c,v 1.29 2017/01/18 08:40:50 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -403,6 +403,12 @@ options_match(const char *s, int *idx, int* ambiguous)
name = options_parse(s, idx);
namelen = strlen(name);
+ *idx = -1;
+ if (*name == '@') {
+ *ambiguous = 0;
+ return (xstrdup(name));
+ }
+
found = NULL;
for (oe = options_table; oe->name != NULL; oe++) {
if (strcmp(oe->name, name) == 0) {