From owner-svn-src-head@freebsd.org  Sat Aug 18 21:03:20 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2508B1076403;
 Sat, 18 Aug 2018 21:03:20 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id C0E787794B;
 Sat, 18 Aug 2018 21:03:19 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9C88D1CC99;
 Sat, 18 Aug 2018 21:03:19 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7IL3JF9020717;
 Sat, 18 Aug 2018 21:03:19 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7IL3JYZ020716;
 Sat, 18 Aug 2018 21:03:19 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201808182103.w7IL3JYZ020716@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Sat, 18 Aug 2018 21:03:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r338028 - head/bin/ls
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/bin/ls
X-SVN-Commit-Revision: 338028
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2018 21:03:20 -0000

Author: kevans
Date: Sat Aug 18 21:03:19 2018
New Revision: 338028
URL: https://svnweb.freebsd.org/changeset/base/338028

Log:
  ls(1): Gate the do_color_* definitions behind COLORLS
  
  Pointy hat to:	me

Modified:
  head/bin/ls/ls.c

Modified: head/bin/ls/ls.c
==============================================================================
--- head/bin/ls/ls.c	Sat Aug 18 20:55:20 2018	(r338027)
+++ head/bin/ls/ls.c	Sat Aug 18 21:03:19 2018	(r338028)
@@ -200,6 +200,7 @@ do_color(void)
 	return (do_color_from_env());
 }
 
+#ifdef COLORLS
 static bool
 do_color_always(const char *term)
 {
@@ -223,6 +224,7 @@ do_color_auto(const char *term)
 	return (strcmp(term, "auto") == 0 || strcmp(term, "tty") == 0 ||
 	    strcmp(term, "if-tty") == 0);
 }
+#endif	/* COLORLS */
 
 int
 main(int argc, char *argv[])