From 01fa95f2b7714fa0f6ce511ab64b22260e2894bc Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Thu, 15 Sep 1994 00:35:50 +0000
Subject: [PATCH] Back out 'not choose first (two-letter) name' fix, all
 two-letter names already removed from 4.4 termcap

---
 usr.bin/tset/tset.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index c0156300d41..60bc5fe0b43 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -209,15 +209,10 @@ main(argc, argv)
 			tcsetattr(STDERR_FILENO, TCSADRAIN, &mode);
 	}
 
-	/*
-	 * The termcap file generally has a two-character name first in each
-	 * entry followed by more descriptive names.  If we ended up with the
-	 * first one, we switch to the second one for setting or reporting
-	 * information.
-	 */
-	p = strpbrk(tcapbuf, "|:");
-	if (p != NULL && *p != ':' && !strncmp(ttype, tcapbuf, p - tcapbuf)) {
-		t = ++p;
+	/* Get the terminal name from the entry. */
+	p = tcapbuf;
+	if (p != NULL && *p != ':') {
+		t = p;
 		if (p = strpbrk(p, "|:")) {
 			savech = *p;
 			*p = '\0';