From: Pádraig Brady <P@draigBrady.com>
Date: Tue, 22 Sep 2009 09:06:49 +0000 (+0100)
Subject: ls: fix a performance regression
X-Git-Tag: v8.0~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c92bb3441c628fe87ccf4a946b1c8b14cb0a0d2;p=thirdparty%2Fcoreutils.git

ls: fix a performance regression

* src/ls.c (print_color_indicator): This reinstates commit f3f1ccfd,
21-10-2008, "ls: make it possible to disable file capabilities checking"
which was inadvertently reverted with commit 3a169f4c, 14-09-2009,
"ls: handle disabling of colors consistently ...".
---

diff --git a/src/ls.c b/src/ls.c
index 2fb5282765..859d7c4207 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -4126,7 +4126,8 @@ print_color_indicator (const char *name, mode_t mode, int linkok,
             type = C_SETUID;
           else if ((mode & S_ISGID) != 0 && is_colored (C_SETGID))
             type = C_SETGID;
-          else if (has_capability (name) && is_colored (C_CAP))
+          /* has_capability() called second for performance.  */
+          else if (is_colored (C_CAP) && has_capability (name))
             type = C_CAP;
           else if ((mode & S_IXUGO) != 0 && is_colored (C_EXEC))
             type = C_EXEC;