summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <ebb9@byu.net>2007-04-24 09:18:56 +0200
committerJim Meyering <jim@meyering.net>2007-04-24 09:18:56 +0200
commit1d85945321f9118010740785f433d0be18bcbf1a (patch)
tree858ef99956fa128d64aefe9796ec3c3051f5bc73
parent25b8a7a987bcf7bc834fce2f5de2697bde5d156b (diff)
downloadcoreutils-1d85945321f9118010740785f433d0be18bcbf1a.tar.xz
ls --color once again colors dangling symlinks correctly
* src/ls.c (gobble_file): Much like the 2007-04-07 fix, add a term to the expression that decides whether we need stat and/or lstat calls. Reported by Andreas Frische.
-rw-r--r--ChangeLog7
-rw-r--r--src/ls.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 280cf2a0b..b90878cf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-24 Eric Blake <ebb9@byu.net>
+
+ ls --color once again colors dangling symlinks correctly
+ * src/ls.c (gobble_file): Much like the 2007-04-07 fix,
+ add a term to the expression that decides whether we need
+ stat and/or lstat calls. Reported by Andreas Frische.
+
2007-04-16 Jim Meyering <jim@meyering.net>
* src/cut.c (usage): Adjust synopsis to show that an OPTION is required.
diff --git a/src/ls.c b/src/ls.c
index f412dff09..c0e332b3b 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -2578,7 +2578,7 @@ gobble_file (char const *name, enum filetype type, ino_t inode,
&& (type == symbolic_link || type == unknown)
&& (dereference == DEREF_ALWAYS
|| (command_line_arg && dereference != DEREF_NEVER)
- || color_symlink_as_referent))
+ || color_symlink_as_referent || check_symlink_color))
/* Command line dereferences are already taken care of by the above
assertion that the inode number is not yet known. */
|| (print_inode && inode == NOT_AN_INODE_NUMBER)