aboutsummaryrefslogtreecommitdiff
path: root/xterm-keys.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2014-01-31 21:39:56 +0000
committerThomas Adam <thomas@xteddy.org>2014-01-31 21:39:56 +0000
commitd50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987 (patch)
tree397f4999444c2eef367f884b815bec2a14697c3c /xterm-keys.c
parentcbf9224c5f7bcf07352f6ea128c90c12cb0af22e (diff)
parent9f02feb9d089b1a4639afb52ab0e8212eeb55a7c (diff)
downloadrtmux-d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987.tar.gz
rtmux-d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987.tar.bz2
rtmux-d50e47fc4ab5cbbdbe6bbebdc2c36ce3aae6e987.zip
Merge branch 'obsd-master'
Conflicts: Makefile cmd-server-info.c cmd-start-server.c
Diffstat (limited to 'xterm-keys.c')
-rw-r--r--xterm-keys.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xterm-keys.c b/xterm-keys.c
index 8c885875..6916552f 100644
--- a/xterm-keys.c
+++ b/xterm-keys.c
@@ -133,7 +133,7 @@ xterm_keys_match(const char *template, const char *buf, size_t len)
do {
if (*template != '_' && buf[pos] != *template)
return (-1);
- } while (pos++ != len && *++template != '\0');
+ } while (*++template != '\0' && ++pos != len);
if (*template != '\0') /* partial */
return (1);