d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ls(1): Fix color env var checking

Browse Source 
CLICOLOR will behavior as always- if present at all in the environment,
allow colors.

COLORTERM, recently enforced, will have to be both present and not empty.

Submitted by:	imp
This commit is contained in:
Kyle Evans 2018-08-16 01:27:16 +00:00
parent edc391e922
commit 7db2f1fe08
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=337885
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bin/ls/ls.c
View File

@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
#include <limits.h>
#include <locale.h>
#include <pwd.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -152,6 +153,29 @@ char *enter_bold; /* ANSI sequence to set color to bold mode */
static int rval;
static bool
do_color_from_env(void)
{
const char *p;
bool doit;
doit = false;
p = getenv("CLICOLOR");
if (p == NULL) {
/*
* COLORTERM is the more standard name for this variable. We'll
* honor it as long as it's both set and not empty.
*/
p = getenv("COLORTERM");
if (p != NULL && *p != '\0')
doit = true;
} else
doit = true;
return (doit &&
(isatty(STDOUT_FILENO) || getenv("CLICOLOR_FORCE")));
}
int
main(int argc, char *argv[])
{
@ -368,8 +392,7 @@ main(int argc, char *argv[])
f_listdot = 1;
/* Enabling of colours is conditional on the environment. */
if ((getenv("CLICOLOR") || getenv("COLORTERM")) &&
(isatty(STDOUT_FILENO) || getenv("CLICOLOR_FORCE")))
if (do_color_from_env())
#ifdef COLORLS
if (tgetent(termcapbuf, getenv("TERM")) == 1) {
ansi_fgcol = tgetstr("AF", &bp);