===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty-keys.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- src/usr.bin/tmux/tty-keys.c	2019/11/14 15:37:20	1.115
+++ src/usr.bin/tmux/tty-keys.c	2019/11/28 10:17:22	1.116
@@ -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 @@
     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 @@
 	*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 @@
 		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,