diff options
| author |   nicm <nicm@openbsd.org> | 2019-11-28 10:17:22 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2019-11-28 10:17:22 +0000 |
| commit | 2afb856af51beb93c9fc29acf9bedbfd9d33fb13 (patch) | |
| tree | 4bfffc828c4faa10bbf78c6e7858a56f0a3375d8 /usr.bin/tmux/tty-keys.c | |
| parent | Track all elements of a forwarder configuration individually: (diff) | |
| download | wireguard-openbsd-2afb856af51beb93c9fc29acf9bedbfd9d33fb13.tar.xz wireguard-openbsd-2afb856af51beb93c9fc29acf9bedbfd9d33fb13.zip | |
Parse out DA features.
Diffstat (limited to 'usr.bin/tmux/tty-keys.c')
| -rw-r--r-- | usr.bin/tmux/tty-keys.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/usr.bin/tmux/tty-keys.c b/usr.bin/tmux/tty-keys.c index 29f45ed0b6f..3335134fed2 100644 --- a/usr.bin/tmux/tty-keys.c +++ b/usr.bin/tmux/tty-keys.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty-keys.c,v 1.115 2019/11/14 15:37:20 nicm Exp $ */ +/* $OpenBSD: tty-keys.c,v 1.116 2019/11/28 10:17:22 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -1002,8 +1002,8 @@ tty_keys_device_attributes(struct tty *tty, const char *buf, size_t len, size_t *size) { struct client *c = tty->client; - u_int i, a, b; - char tmp[64], *endptr; + u_int i, n = 0; + char tmp[64], *endptr, p[32] = { 0 }, *cp, *next; static const char *types[] = TTY_TYPES; int type; @@ -1035,23 +1035,21 @@ tty_keys_device_attributes(struct tty *tty, const char *buf, size_t len, *size = 4 + i; /* Convert version numbers. */ - a = strtoul(tmp, &endptr, 10); - if (*endptr == ';') { - b = strtoul(endptr + 1, &endptr, 10); + cp = tmp; + while ((next = strsep(&cp, ";")) != NULL) { + p[n] = strtoul(next, &endptr, 10); if (*endptr != '\0' && *endptr != ';') - b = 0; - } else if (*endptr == '\0') - b = 0; - else - a = b = 0; + p[n] = 0; + n++; + } /* Store terminal type. */ type = TTY_UNKNOWN; - switch (a) { + switch (p[0]) { case 1: - if (b == 2) + if (p[1] == 2) type = TTY_VT100; - else if (b == 0) + else if (p[1] == 0) type = TTY_VT101; break; case 6: @@ -1070,6 +1068,8 @@ tty_keys_device_attributes(struct tty *tty, const char *buf, size_t len, type = TTY_VT520; break; } + for (i = 2; i < n; i++) + log_debug("%s: DA feature: %d", c->name, p[i]); tty_set_type(tty, type); log_debug("%s: received DA %.*s (%s)", c->name, (int)*size, buf, |