svn commit: r337826 - stable/11/bin/ls

[Kyle Evans]

Author: kevans
Date: Wed Aug 15 01:29:02 2018
New Revision: 337826
URL: https://svnweb.freebsd.org/changeset/base/337826

Log:
  MFC r337506: 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

Modified:
  stable/11/bin/ls/ls.1
  stable/11/bin/ls/ls.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/bin/ls/ls.1
==============================================================================
--- stable/11/bin/ls/ls.1	Wed Aug 15 01:24:43 2018	(r337825)
+++ stable/11/bin/ls/ls.1	Wed Aug 15 01:29:02 2018	(r337826)
@@ -32,7 +32,7 @@
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
 .\" $FreeBSD$
 .\"
-.Dd December 1, 2015
+.Dd August 8, 2018
 .Dt LS 1
 .Os
 .Sh NAME
@@ -140,6 +140,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
@@ -636,6 +638,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
@@ -660,7 +666,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
@@ -767,6 +775,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.

Modified: stable/11/bin/ls/ls.c
==============================================================================
--- stable/11/bin/ls/ls.c	Wed Aug 15 01:24:43 2018	(r337825)
+++ stable/11/bin/ls/ls.c	Wed Aug 15 01:29:02 2018	(r337826)
@@ -374,7 +374,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) {