From 28b3902ea7a3ea216e69eab80f192462bc158023 Mon Sep 17 00:00:00 2001
From: Heinrich Kuttler <hnr@fb.com>
Date: Thu, 22 Jul 2021 09:42:34 +0200
Subject: [PATCH] termcap.c: Don't use hilites[CLR_BLACK] = NULL for
 ANSI_DEFAULT

This didn't crash since xputs is defensive and checks if it got a NULL
string, but it also didn't display black entries (dragons, unicorns,
orcish arrows, ...) as black or otherwise different from gray entries.
---
 win/tty/termcap.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/win/tty/termcap.c b/win/tty/termcap.c
index 6429a04f7..47d872a66 100644
--- a/win/tty/termcap.c
+++ b/win/tty/termcap.c
@@ -1179,6 +1179,16 @@ init_hilite(void)
             Sprintf(hilites[c], "\033[0;3%dm", c);
         }
     }
+
+    /* See TEXTCOLOR && TERMLIB && UNIX && TERMINFO code above. */
+    if (iflags.wc2_darkgray) {
+        /* Bright black is dark gray. */
+        hilites[CLR_BLACK] = (char *) alloc(sizeof "\033[1;30m");
+        Sprintf(hilites[CLR_BLACK], "\033[1;30m");
+    } else {
+        /* Use blue for black. */
+        hilites[CLR_BLACK] = hilites[CLR_BLUE];
+    }
 }
 
 static void
@@ -1200,7 +1210,12 @@ kill_hilite(void)
         if (hilites[c | BRIGHT] && hilites[c | BRIGHT] != nh_HI)
             free((genericptr_t) hilites[c | BRIGHT]), hilites[c | BRIGHT] = 0;
     }
-    return;
+
+    if (hilites[CLR_BLACK]) {
+        if (hilites[CLR_BLACK] != hilites[CLR_BLUE])
+            free(hilites[CLR_BLACK]);
+        hilites[CLR_BLACK] = 0;
+    }
 }
 #endif /* TEXTCOLOR && !TERMLIB && ANSI_DEFAULT */