svn commit: r337506 - head/bin/ls
Kyle Evans
kevans at FreeBSD.org
Wed Aug 8 21:51:21 UTC 2018
Author: kevans
Date: Wed Aug 8 21:51:19 2018
New Revision: 337506
URL: https://svnweb.freebsd.org/changeset/base/337506
Log:
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 at xsmail.com> (with manpage additions by myself)
Reviewed by: cem ("LGTM" in PR; pre-manpage changes)
MFC after: 1 week
Modified:
head/bin/ls/ls.1
head/bin/ls/ls.c
Modified: head/bin/ls/ls.1
==============================================================================
--- head/bin/ls/ls.1 Wed Aug 8 21:37:02 2018 (r337505)
+++ head/bin/ls/ls.1 Wed Aug 8 21:51:19 2018 (r337506)
@@ -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.
Modified: head/bin/ls/ls.c
==============================================================================
--- head/bin/ls/ls.c Wed Aug 8 21:37:02 2018 (r337505)
+++ head/bin/ls/ls.c Wed Aug 8 21:51:19 2018 (r337506)
@@ -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) {
More information about the svn-src-all
mailing list