+2007-07-15 Jim Meyering <jim@meyering.net>
+
+ ls --color: Don't stat symlinks when neither ORPHAN nor MISSING
+ attribute has a color.
+ * src/ls.c (main): Don't set check_symlink_color when C_EXEC is
+ colored, unless ln=target (aka color_symlink_as_referent) is set.
+ (gobble_file): Set f->linkok = true also when !check_symlink_color.
+ http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/10608/focus=10927
+ Reported by Jeremy Maitin-Shepard.
+ * tests/strace: New file, contents extracted from...
+ * tests/mv/atomic: ...here. Source strace.
+ * tests/ls/stat-free-symlinks: New file. Test for the above.
+ Use strace to ensure that in this corner case, ls does not call stat.
+ * tests/ls/Makefile.am (TESTS): Add stat-free-symlinks.
+ * tests/Makefile.am (EXTRA_DIST): Add strace.
+
2007-07-14 Jim Meyering <jim@meyering.net>
Remove long-deprecated options.
Jeff Sheinberg jeff@bsrd.net
Jens Elkner elkner@imsgroup.de
Jens Schmidt jms@jsds.hamburg.com
+Jeremy Maitin-Shepard jbms@cmu.edu
Jerome Abela abela@hsc.fr
Jérôme Zago bug-coreutils-ml@agt-the-walker.net
Jesse Kornblum kornblum@usna.edu
{
/* Avoid following symbolic links when possible. */
if (is_colored (C_ORPHAN)
- || is_colored (C_EXEC)
+ || (is_colored (C_EXEC) && color_symlink_as_referent)
|| (is_colored (C_MISSING) && format == long_format))
check_symlink_color = true;
free (linkname);
}
+ /* When not distinguishing types of symlinks, pretend we know that
+ it is stat'able, so that it will be colored as a regular symlink,
+ and not as an orphan. */
+ if (S_ISLNK (f->stat.st_mode) && !check_symlink_color)
+ f->linkok = true;
+
if (S_ISLNK (f->stat.st_mode))
f->filetype = symbolic_link;
else if (S_ISDIR (f->stat.st_mode))
expensive group-names input-tty lang-default mk-script \
other-fs-tmpdir priv-check \
rwx-to-mode sample-test selinux setgid-check sparse-file \
+ strace \
umask-check very-expensive
## N O T E :: Please do not add new tests/ directories.
# 02110-1301, USA.
TESTS = \
+ stat-free-symlinks \
nameless-uid \
color-dtype-dir \
stat-failed \
--- /dev/null
+#!/bin/sh
+# ensure that ls does not stat a symlink in an unusual case
+
+# Copyright (C) 2007 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 3 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
+. $srcdir/../strace
+
+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
+
+touch x || framework_failure=1
+chmod a+x x || framework_failure=1
+ln -s x link-to-x || framework_failure=1
+
+if test $framework_failure = 1; then
+ echo "$0: failure in testing framework" 1>&2
+ (exit 1); exit 1
+fi
+
+fail=0
+
+# ls from coreutils 6.9 would unnecessarily stat a symlink in an unusual case:
+# When not coloring orphan and missing entries, and without ln=target,
+# ensure that ls -F (or -d, or -l: i.e., when not dereferencing)
+# does not stat a symlink to directory, and does still color that
+# symlink and an executable file properly.
+
+LS_COLORS='or=0:mi=0:ex=01;32:ln=01;35' \
+ strace -qe stat ls -F --color=always x link-to-x > out 2> err || fail=1
+
+# With coreutils 6.9 and earlier, this file would contain a
+# line showing ls had called stat on "x".
+test -s err && fail=1
+
+# Check that output is colorized, as requested, too.
+{
+ printf '\e[0m\e[01;35mlink-to-x\e[0m@\n'
+ printf '\e[01;32mx\e[0m*\n'
+ printf '\e[m'
+} > exp || fail=1
+
+cmp out exp || fail=1
+test $fail = 1 && diff out exp 2> /dev/null
+
+(exit $fail); exit $fail
mv --version
fi
+. $srcdir/../strace
+
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
(exit 1); exit 1
fi
-# Skip this test on systems without strace.
-strace -V < /dev/null > ver 2>&1 || skip=1
-if test "$skip" = 1; then
- echo "$0: no strace program, so skipping this test" 1>&2
- (exit 77); exit 77
-fi
-
-strace -qe unlink echo > /dev/null 2>&1 || skip=1
-if test "$skip" = 1; then
- echo "$0: strace doesn't work, so skipping this test" 1>&2
- (exit 77); exit 77
-fi
-
fail=0
strace -qe unlink mv -T s1 s2 > out 2>&1 || fail=1
--- /dev/null
+# Skip the current test if strace is not available or doesn't work.
+
+# Copyright (C) 2007 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 3 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.
+
+strace -V < /dev/null > /dev/null 2>&1 ||
+{
+ echo "$0: no strace program, so skipping this test" 1>&2
+ (exit 77); exit 77
+}
+
+strace -qe unlink echo > /dev/null 2>&1 ||
+{
+ echo "$0: strace doesn't work, so skipping this test" 1>&2
+ (exit 77); exit 77
+}
projects / platform / upstream / coreutils.git / commitdiff