Date: Thu, 16 Aug 2018 01:18:21 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r337884 - stable/11/bin/ls Message-ID: <201808160118.w7G1IL90006511@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Thu Aug 16 01:18:20 2018 New Revision: 337884 URL: https://svnweb.freebsd.org/changeset/base/337884 Log: Revert r337826: MFC of ls(1) COLORTERM honoring It was not ready, and was much-objected-to. 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 Thu Aug 16 00:50:14 2018 (r337883) +++ stable/11/bin/ls/ls.1 Thu Aug 16 01:18:20 2018 (r337884) @@ -32,7 +32,7 @@ .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 .\" $FreeBSD$ .\" -.Dd August 8, 2018 +.Dd December 1, 2015 .Dt LS 1 .Os .Sh NAME @@ -140,8 +140,6 @@ 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 @@ -638,10 +636,6 @@ 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 @@ -666,9 +660,7 @@ 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 -or -.Ev COLORTERM . +.Ev CLICOLOR . This string is a concatenation of pairs of the format .Ar f Ns Ar b , where @@ -775,8 +767,6 @@ 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 Thu Aug 16 00:50:14 2018 (r337883) +++ stable/11/bin/ls/ls.c Thu Aug 16 01:18:20 2018 (r337884) @@ -374,7 +374,7 @@ main(int argc, char *argv[]) f_listdot = 1; /* Enabling of colours is conditional on the environment. */ - if ((getenv("CLICOLOR") || getenv("COLORTERM")) && + if (getenv("CLICOLOR") && (isatty(STDOUT_FILENO) || getenv("CLICOLOR_FORCE"))) #ifdef COLORLS if (tgetent(termcapbuf, getenv("TERM")) == 1) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808160118.w7G1IL90006511>