diff options
author | ache <ache@FreeBSD.org> | 1994-09-15 00:35:50 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 1994-09-15 00:35:50 +0000 |
commit | 3b5314a35c298610bffa6b58aacd02de680f84a9 (patch) | |
tree | 8de429e538e13b97675017265e22c73a4f3f4fa5 /usr.bin/tset | |
parent | 4e919873073ece6ca4fff2813283fb57314c3ac6 (diff) | |
download | FreeBSD-src-3b5314a35c298610bffa6b58aacd02de680f84a9.zip FreeBSD-src-3b5314a35c298610bffa6b58aacd02de680f84a9.tar.gz |
Back out 'not choose first (two-letter) name' fix, all two-letter names
already removed from 4.4 termcap
Diffstat (limited to 'usr.bin/tset')
-rw-r--r-- | usr.bin/tset/tset.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c index c015630..60bc5fe 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'; |