diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2020-05-21 03:50:56 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2020-05-21 03:50:56 +0000 |
| commit | c0f34ded0b059b1c1fd9943684368cf87e08bff0 (patch) | |
| tree | 22bff76b558eb523ac90de66d57e93090b303eac /bin | |
| parent | b923b34a0f4d03bc541938dcfbee4b4fda1c5a33 (diff) | |
Notes
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/ls/ls.1 | 12 | ||||
| -rw-r--r-- | bin/ls/ls.c | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1 index dde947be98759..edce3491b50b7 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 August 18, 2018 +.Dd May 20, 2020 .Dt LS 1 .Os .Sh NAME @@ -216,8 +216,8 @@ Output colored escape sequences based on .Ar when , which may be set to either .Cm always , -.Cm auto -(default), or +.Cm auto , +or .Cm never . .Pp .Cm always @@ -252,6 +252,12 @@ environment variable is set and not empty. .Pp .Cm never will disable color regardless of environment variables. +.Cm never +is the default when neither +.Fl -color +nor +.Fl G +is specified. .Pp For compatibility with GNU coreutils, .Nm diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 3410ea0619a10..681570e552b20 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -152,7 +152,7 @@ static int f_timesort; /* sort by time vice name */ int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ #ifdef COLORLS - int colorflag = COLORFLAG_AUTO; /* passed in colorflag */ + int colorflag = COLORFLAG_NEVER; /* passed in colorflag */ int f_color; /* add type in color for non-regular files */ bool explicitansi; /* Explicit ANSI sequences, no termcap(5) */ char *ansi_bgcol; /* ANSI sequence to set background colour */ |