diff options
| author | Tavian Barnes <tavianator@tavianator.com> | 2023-07-13 16:00:02 -0400 |
|---|---|---|
| committer | Tavian Barnes <tavianator@tavianator.com> | 2023-07-13 16:04:18 -0400 |
| commit | b4c3201ccceb9c73dd7751d7f9937b4afe78966f (patch) | |
| tree | 149930ae81ac27d899316165333de4f1aeb50410 | |
| parent | 0e4dffeb46f3d8bfe30d60a0cfe1e1fa5a082b13 (diff) | |
| download | bfs-b4c3201ccceb9c73dd7751d7f9937b4afe78966f.tar.xz | |
color: Only highlight the trailing slash on ENOTDIR
| -rw-r--r-- | src/color.c | 6 | ||||
| -rw-r--r-- | tests/bfs/color_ls.out | 4 | ||||
| -rw-r--r-- | tests/bfs/color_ls.sh | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/color.c b/src/color.c index 7d98978..f7a5d86 100644 --- a/src/color.c +++ b/src/color.c @@ -982,8 +982,10 @@ static ssize_t first_broken_offset(const char *path, const struct BFTW *ftwbuf, while (ret && at_path[len - 1] == '/') { --len, --ret; } - while (ret && at_path[len - 1] != '/') { - --len, --ret; + if (errno != ENOTDIR) { + while (ret && at_path[len - 1] != '/') { + --len, --ret; + } } dstresize(&at_path, len); diff --git a/tests/bfs/color_ls.out b/tests/bfs/color_ls.out index b5216c4..f69eb9c 100644 --- a/tests/bfs/color_ls.out +++ b/tests/bfs/color_ls.out @@ -2,11 +2,11 @@ [01;31mscratch/foo/bar[0m [01;34m/[0m[01;31m__bfs__/nowhere[0m [01;34m/[0m[01;31m__bfs__/nowhere[0m -[01;34mfoo/bar/[0m[01;31mbaz/qux[0m -[01;34mfoo/bar/[0m[01;31mbaz/qux[0m [01;34mfoo/bar/[0m[01;31mnowhere[0m [01;34mfoo/bar/[0m[01;31mnowhere[0m [01;34mfoo/bar/[0m[01;31mnowhere/nothing[0m [01;34mfoo/bar/[0m[01;31mnowhere/nothing[0m [01;34mfoo/bar/[0mbaz [01;34mfoo/bar/[0mbaz +[01;34mfoo/bar/baz[0m[01;31m//qux[0m +[01;34mfoo/bar/baz[0m[01;31m//qux[0m diff --git a/tests/bfs/color_ls.sh b/tests/bfs/color_ls.sh index 37d088f..f2d3c72 100644 --- a/tests/bfs/color_ls.sh +++ b/tests/bfs/color_ls.sh @@ -3,13 +3,13 @@ clean_scratch ln -s foo/bar/baz scratch/link ln -s foo/bar/nowhere scratch/broken ln -s foo/bar/nowhere/nothing scratch/nested -ln -s foo/bar/baz/qux scratch/notdir +ln -s foo/bar/baz//qux scratch/notdir ln -s scratch/foo/bar scratch/relative mkdir scratch/__bfs__ ln -s /__bfs__/nowhere scratch/absolute -LS_COLORS="or=01;31:" invoke_bfs scratch/{,link,broken,nested,notdir,relative,absolute} -color -type l -ls \ +export LS_COLORS="or=01;31:" +invoke_bfs scratch/{,link,broken,nested,notdir,relative,absolute} -color -type l -ls \ | sed 's/.* -> //' \ | sort >"$OUT" - diff_output |