"ls --color" would highlight other-writable and sticky directories

no differently than regular directories on a file system with
dirent.d_type support.
* NEWS: Say the above.
* src/ls.c (gobble_file): With --color, also stat the file when
we know it is a directory.
Derived from an anonymous one-line fix and bug report:
<https://savannah.gnu.org/bugs/?15043>.
* tests/ls/color-dtype-dir: New file.  Test for the above fix.
* tests/ls/Makefile.am (TESTS): Add color-dtype-dir.

diff --git a/ChangeLog b/ChangeLog
index db2a827702b5dab6aa84152b05d80b7fa4752d47..588eedde02c736f79367b8db06a6eb2a7d3a9280 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-08-26  Jim Meyering  <jim@meyering.net>
+
+       "ls --color" would highlight other-writable and sticky directories
+       no differently than regular directories on a file system with
+       dirent.d_type support.
+       * NEWS: Say the above.
+       * src/ls.c (gobble_file): With --color, also stat the file when
+       we know it is a directory.
+       Derived from an anonymous one-line fix and bug report:
+       <https://savannah.gnu.org/bugs/?15043>.
+       * tests/ls/color-dtype-dir: New file.  Test for the above fix.
+       * tests/ls/Makefile.am (TESTS): Add color-dtype-dir.
+
 2006-08-25  Paul Eggert  <eggert@cs.ucla.edu>
 
        * .cvsignore: Remove stamp-h1.  Add coreutils-*, to ignore

diff --git a/NEWS b/NEWS
index 869e6ca3c4d3dc4cbdbbc5000c1ea661f960bb2d..d98f13bf4b51c727cce282d5b395dcb125dd2810 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,13 @@ GNU coreutils NEWS                                    -*- outline -*-
   in README-cvs.  Although this represents a large change to the
   infrastructure, it should cause no change in the actual tools.
 
+** Bug fixes
+
+  "ls --color" would highlight other-writable and sticky directories
+  no differently than regular directories on a file system with
+  dirent.d_type support.
+
+
 * Major changes in release 6.1 (2006-08-19) [unstable]
 
 ** Changes in behavior

diff --git a/src/ls.c b/src/ls.c
index 162b5157cc58b797a40d4e44fbc931a0e5657b92..8b4fb2e433b8f7d65bc7af003cefde2a73ceb37e 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -2531,6 +2531,10 @@ gobble_file (char const *name, enum filetype type, ino_t inode,
 
   if (command_line_arg
       || format_needs_stat
+      /* When coloring a directory (we may know the type from
+        direct.d_type), we have to stat it in order to indicate
+        sticky and/or other-writable attributes.  */
+      || (type == directory && print_with_color)
       || (print_inode
          && (inode == NOT_AN_INODE_NUMBER
              /* When dereferencing symlinks, the inode must come from

diff --git a/tests/ls/Makefile.am b/tests/ls/Makefile.am
index add9988c1ac73719c403745d5de7d84e7e922e4e..9be2423458be9665bcb1fa8d6efa1f2eb22ec357 100644 (file)
--- a/tests/ls/Makefile.am
+++ b/tests/ls/Makefile.am
@@ -21,6 +21,7 @@
 AUTOMAKE_OPTIONS = 1.2 gnits
 
 TESTS = \
+  color-dtype-dir \
   stat-failed \
   stat-dtype \
   inode dangle file-type recursive dired infloop \

diff --git a/tests/ls/color-dtype-dir b/tests/ls/color-dtype-dir
new file mode 100755 (executable)
index 0000000..2cd6911
--- /dev/null
+++ b/tests/ls/color-dtype-dir
@@ -0,0 +1,70 @@
+#!/bin/sh
+# Ensure "ls --color" properly colors other-writable and sticky directories.
+# Before coreutils-6.2, this test would fail, coloring all three
+# directories the same as the first one -- but only on a file system
+# with dirent.d_type support.
+
+# Copyright (C) 2006 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+if test "$VERBOSE" = yes; then
+  set -x
+  ls --version
+fi
+
+. $srcdir/../envvar-check
+
+pwd=`pwd`
+t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
+trap 'status=$?; cd $pwd; chmod -R u+rwx $t0; rm -rf $t0 && exit $status' 0
+trap '(exit $?); exit $?' 1 2 13 15
+
+framework_failure=0
+mkdir -p $tmp || framework_failure=1
+cd $tmp || framework_failure=1
+
+mkdir d other-writable sticky || framework_failure=1
+chmod o+w other-writable || framework_failure=1
+chmod o+t sticky || framework_failure=1
+
+if test $framework_failure = 1; then
+  echo "$0: failure in testing framework" 1>&2
+  (exit 1); exit 1
+fi
+
+fail=0
+
+# Ensure that LS_COLORS is set to known values.
+eval "`dircolors -b`"
+
+ls --color=always > out || fail=1
+cat -A out > o1 || fail=1
+echo >> o1 || fail=1
+mv o1 out || fail=1
+
+cat <<\EOF > exp || fail=1
+^[[00m^[[01;34md^[[00m$
+^[[34;42mother-writable^[[00m$
+^[[00mout^[[00m$
+^[[37;44msticky^[[00m$
+^[[m
+EOF
+
+cmp out exp || fail=1
+test $fail = 1 && diff out exp 2> /dev/null
+
+(exit $fail); exit $fail