From 33ce7acbb02ccfd11bd22edcb667b3666f4856d2 Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Wed, 8 Aug 2018 21:51:19 +0000
Subject: [PATCH] ls(1): Enable colors with COLORTERM is set in the environment

COLORTERM is the de facto standard, while CLICOLOR is generally specific to
FreeBSD and ls(1).

PR:		230101
Submitted by:	D Green <dfrg@xsmail.com> (with manpage additions by myself)
Reviewed by:	cem ("LGTM" in PR; pre-manpage changes)
MFC after:	1 week
---
 bin/ls/ls.1 | 14 ++++++++++++--
 bin/ls/ls.c |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index c7b24ae5a55a..8495367de4e7 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -32,7 +32,7 @@
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
 .\" $FreeBSD$
 .\"
-.Dd January 17, 2018
+.Dd August 8, 2018
 .Dt LS 1
 .Os
 .Sh NAME
@@ -132,6 +132,8 @@ after each that is a
 Enable colorized output.
 This option is equivalent to defining
 .Ev CLICOLOR
+or
+.Ev COLORTERM
 in the environment.
 (See below.)
 This functionality can be compiled out by removing the definition of
@@ -628,6 +630,10 @@ The
 variable still needs to reference a color capable terminal however
 otherwise it is not possible to determine which color sequences to
 use.
+.It Ev COLORTERM
+See description for
+.Ev CLICOLOR
+above.
 .It Ev COLUMNS
 If this variable contains a string representing a
 decimal integer, it is used as the
@@ -652,7 +658,9 @@ for more information.
 .It Ev LSCOLORS
 The value of this variable describes what color to use for which
 attribute when colors are enabled with
-.Ev CLICOLOR .
+.Ev CLICOLOR
+or
+.Ev COLORTERM .
 This string is a concatenation of pairs of the format
 .Ar f Ns Ar b ,
 where
@@ -759,6 +767,8 @@ option for more details.
 .It Ev TERM
 The
 .Ev CLICOLOR
+and
+.Ev COLORTERM
 functionality depends on a terminal type with color capabilities.
 .It Ev TZ
 The timezone to use when displaying dates.
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index 87b314cbdff1..7c7174f25f4f 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -368,7 +368,7 @@ main(int argc, char *argv[])
 		f_listdot = 1;
 
 	/* Enabling of colours is conditional on the environment. */
-	if (getenv("CLICOLOR") &&
+	if ((getenv("CLICOLOR") || getenv("COLORTERM")) &&
 	    (isatty(STDOUT_FILENO) || getenv("CLICOLOR_FORCE")))
 #ifdef COLORLS
 		if (tgetent(termcapbuf, getenv("TERM")) == 1) {