From 383713e03057588985a397b184b733dbf552baf2 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 24 Apr 2007 09:20:52 +0200 Subject: * THANKS: Add Andreas Frische. * NEWS: Mention today's ls --color fix. * tests/ls-2/tests (sl-dangle): Add a test for today's fix. --- ChangeLog | 6 ++++++ NEWS | 5 +++++ THANKS | 1 + tests/ls-2/tests | 13 +++++++++++++ 4 files changed, 25 insertions(+) diff --git a/ChangeLog b/ChangeLog index b90878cf9..c3a73ffa7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-04-24 Jim Meyering + + * THANKS: Add Andreas Frische. + * NEWS: Mention today's ls --color fix. + * tests/ls-2/tests (sl-dangle): Add a test for today's fix. + 2007-04-24 Eric Blake ls --color once again colors dangling symlinks correctly diff --git a/NEWS b/NEWS index c4678e7dd..0542cd987 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,11 @@ GNU coreutils NEWS -*- outline -*- ls -x DIR would sometimes output the wrong string in place of the first entry. [introduced in coreutils-6.8] + ls --color would mistakenly color a dangling symlink as if it were + a regular symlink. This would happen only when the dangling symlink + was not a command-line argument and in a directory with d_type support. + [introduced in coreutils-6.0] + ls --color, (with a custom LS_COLORS envvar value including the ln=target attribute) would mistakenly output the string "target" before the name of each symlink. [introduced in coreutils-6.0] diff --git a/THANKS b/THANKS index 63fcc39f8..2033c3845 100644 --- a/THANKS +++ b/THANKS @@ -26,6 +26,7 @@ Alexey Vyskubov alexey@pippuri.mawhrin.net Alfred M. Szmidt ams@kemisten.nu Andi Kleen freitag@alancoxonachip.com Andre Novaes Cunha Andre.Cunha@br.global-one.net +Andreas Frische andreasfrische@gmail.com Andreas Gruenbacher ag@bestbits.at Andreas Jaeger jaeger@gnu.org Andreas Luik luik@isa.de diff --git a/tests/ls-2/tests b/tests/ls-2/tests index 3f2fc1df7..9bf40577d 100755 --- a/tests/ls-2/tests +++ b/tests/ls-2/tests @@ -130,6 +130,19 @@ my @Tests = ['sl-target', '--color=always d', {OUT => "\e[0m\e[01;34mX\e[0m\n\e[m"}, $target, $target2], + # Test for another bug fixed in coreutils-6.10. + # This one bites only for a system/file system with d_type support. + ['sl-dangle', '--color=always d', + {OUT => "\e[0m\e[40;31;01mX\e[0m\n\e[m"}, + {PRE => sub { + mkdir 'd',0755 or die "d: $!\n"; + symlink 'non-existent', 'd/X' or die "d/X: $!\n"; + $ENV{LS_COLORS}='or=40;31;01' + }}, + {POST => sub {unlink 'd/X' or die "d/X: $!\n"; + rmdir 'd' or die "d: $!\n" }}, + ], + # Test for a bug that was introduced in coreutils-4.5.4; fixed in 4.5.5. # To demonstrate it, the file in question (with executable bit set) # must not be a command line argument. -- cgit v1.2.3-54-g00ecf