From 7152645618fc22766f5c954d12e9489866633e26 Mon Sep 17 00:00:00 2001
From: Jody Frankowski <jody.frankowski@gmail.com>
Date: Thu, 31 Oct 2024 13:13:20 +0100
Subject: color: Handle bfs_check_capabilities error code (-1) in
cpath_has_capabilities
On non-Linux systems, bfs_check_capabilities always returned -1, so
cpath_has_capabilities would always return true. If bfs was called with
an LS_COLORS containing the `ca` statement, e.g. `ca=30;41`, bfs would
color ALL the files. While including the `ca` statement in LS_COLORS
on non-Linux systems is unusual, this is not an error and is a valid
use-case (e.g. Using GNU ls or lsd).
Fixes: 1520d4d3 ("color: Don't color files like directories on ENOTDIR")
---
tests/bfs/color_ca.out | 4 ++++
tests/bfs/color_ca.sh | 10 ++++++++++
tests/bfs/color_ca_incapable.out | 27 +++++++++++++++++++++++++++
tests/bfs/color_ca_incapable.sh | 1 +
4 files changed, 42 insertions(+)
create mode 100644 tests/bfs/color_ca.out
create mode 100644 tests/bfs/color_ca.sh
create mode 100644 tests/bfs/color_ca_incapable.out
create mode 100644 tests/bfs/color_ca_incapable.sh
(limited to 'tests/bfs')
diff --git a/tests/bfs/color_ca.out b/tests/bfs/color_ca.out
new file mode 100644
index 0000000..bf74202
--- /dev/null
+++ b/tests/bfs/color_ca.out
@@ -0,0 +1,4 @@
+[01;34m.[0m
+[01;34m./[0m[01;36mlink[0m
+[01;34m./[0m[30;41mcapable[0m
+[01;34m./[0mnormal
diff --git a/tests/bfs/color_ca.sh b/tests/bfs/color_ca.sh
new file mode 100644
index 0000000..3aaaaf1
--- /dev/null
+++ b/tests/bfs/color_ca.sh
@@ -0,0 +1,10 @@
+test "$UNAME" = "Linux" || skip
+invoke_bfs . -quit -capable || skip
+
+cd "$TEST"
+
+"$XTOUCH" normal capable
+bfs_sudo setcap all+ep capable || skip
+ln -s capable link
+
+LS_COLORS="ca=30;41:" bfs_diff . -color
diff --git a/tests/bfs/color_ca_incapable.out b/tests/bfs/color_ca_incapable.out
new file mode 100644
index 0000000..a439814
--- /dev/null
+++ b/tests/bfs/color_ca_incapable.out
@@ -0,0 +1,27 @@
+[01;34m$'rainbow/\e[1m'[0m
+[01;34m$'rainbow/\e[1m/'[0m$'\e[0m'
+[01;34mrainbow[0m
+[01;34mrainbow/[0m[01;32mexec.sh[0m
+[01;34mrainbow/[0m[01;35msocket[0m
+[01;34mrainbow/[0m[01;36mbroken[0m
+[01;34mrainbow/[0m[01;36mchardev_link[0m
+[01;34mrainbow/[0m[01;36mlink.txt[0m
+[01;34mrainbow/[0m[30;42msticky_ow[0m
+[01;34mrainbow/[0m[30;43msgid[0m
+[01;34mrainbow/[0m[33mpipe[0m
+[01;34mrainbow/[0m[34;42mow[0m
+[01;34mrainbow/[0m[37;41msugid[0m
+[01;34mrainbow/[0m[37;41msuid[0m
+[01;34mrainbow/[0m[37;44msticky[0m
+[01;34mrainbow/[0mfile.dat
+[01;34mrainbow/[0mfile.txt
+[01;34mrainbow/[0mlower.gz
+[01;34mrainbow/[0mlower.tar
+[01;34mrainbow/[0mlower.tar.gz
+[01;34mrainbow/[0mlu.tar.GZ
+[01;34mrainbow/[0mmh1
+[01;34mrainbow/[0mmh2
+[01;34mrainbow/[0mul.TAR.gz
+[01;34mrainbow/[0mupper.GZ
+[01;34mrainbow/[0mupper.TAR
+[01;34mrainbow/[0mupper.TAR.GZ
diff --git a/tests/bfs/color_ca_incapable.sh b/tests/bfs/color_ca_incapable.sh
new file mode 100644
index 0000000..f46a127
--- /dev/null
+++ b/tests/bfs/color_ca_incapable.sh
@@ -0,0 +1 @@
+LS_COLORS="ca=30;41:" bfs_diff rainbow -color
--
cgit v1.2.3