From 9c5300d4aef487ff4ca52c21cac295c80951204b Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Sat, 12 Jan 2008 20:38:26 +0000
Subject: [PATCH] Many termcap db's don't have ch or RI even though they do
 work

---
 src/libeinfo/libeinfo.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c
index a8bd8254..50d84c60 100644
--- a/src/libeinfo/libeinfo.c
+++ b/src/libeinfo/libeinfo.c
@@ -184,6 +184,7 @@ static const char *const color_terms[] = {
 	"screen.linux",
 	"vt100",
 	"vt220",
+	"wsvt25",
 	"xterm",
 	"xterm-256color",
 	"xterm-color",
@@ -359,7 +360,7 @@ static bool colour_terminal (FILE * __EINFO_RESTRICT f)
 
 	/* Cheat here as vanilla BSD has the whole termcap info in /usr
 	 * which is not available to us when we boot */
-	if (term_is_cons25) {
+	if (term_is_cons25 || strcmp (term, "wsvt25") == 0) {
 #else
 		while (color_terms[i]) {
 			if (strcmp (color_terms[i], term) == 0) {
@@ -388,10 +389,15 @@ static bool colour_terminal (FILE * __EINFO_RESTRICT f)
 #ifdef HAVE_TERMCAP
 	}
 
-	if (! _af || ! _ce || ! _ch || ! _me || !_md || ! _up) {
+	if (! _af || ! _ce || ! _me || !_md || ! _up) {
 		in_colour = 0;
 		return (false);
 	}
+
+	/* Many termcap databases don't have ch or RI even though they
+	 * do work */
+	if (! _ch)
+		_ch = CH;
 #endif
 
 	/* Now setup our colours */