mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-04-20 18:56:39 +02:00
"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.
This commit is contained in:
@@ -21,6 +21,7 @@
|
||||
AUTOMAKE_OPTIONS = 1.2 gnits
|
||||
|
||||
TESTS = \
|
||||
color-dtype-dir \
|
||||
stat-failed \
|
||||
stat-dtype \
|
||||
inode dangle file-type recursive dired infloop \
|
||||
|
||||
70
tests/ls/color-dtype-dir
Executable file
70
tests/ls/color-dtype-dir
Executable file
@@ -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
|
||||
Reference in New Issue
Block a user