diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rwxr-xr-x | tests/chgrp/no-x | 1 | ||||
| -rwxr-xr-x | tests/chmod/no-x | 1 | ||||
| -rwxr-xr-x | tests/du/inacc-dest | 82 | ||||
| -rwxr-xr-x | tests/du/no-x | 1 |
5 files changed, 91 insertions, 3 deletions
@@ -1,5 +1,14 @@ 2006-11-12 Jim Meyering <jim@meyering.net> + du would exit early, when encountering an inaccessible directory + Reported by Mike Frysinger, in + http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/8831 + * tests/du/inacc-dest: New test, based on an example from Mike Frysinger. + * tests/chgrp/no-x: Remove the "fts_read failed: ..." + diagnostic from the expected output when using native fdopendir. + * tests/chmod/no-x: Likewise. + * tests/du/no-x: Likewise. + * Makefile.maint (sc_cast_of_x_alloc_return_value): Add an exclusion for xalloc.h itself. diff --git a/tests/chgrp/no-x b/tests/chgrp/no-x index b8ebed5f6..e9c702d7f 100755 --- a/tests/chgrp/no-x +++ b/tests/chgrp/no-x @@ -59,7 +59,6 @@ EOF # With native fdopendir, du uses a different code path. cat <<\EOF > exp-native-fdopendir chgrp: cannot access `d/no-x/y': Permission denied -chgrp: fts_read failed: Permission denied EOF if cmp out exp >/dev/null 2>&1; then diff --git a/tests/chmod/no-x b/tests/chmod/no-x index b8eed3460..34b395201 100755 --- a/tests/chmod/no-x +++ b/tests/chmod/no-x @@ -55,7 +55,6 @@ EOF # With native fdopendir, du uses a different code path. cat <<\EOF > exp-native-fdopendir chmod: cannot access `d/no-x/y': Permission denied -chmod: fts_read failed: Permission denied EOF if cmp out exp >/dev/null 2>&1; then diff --git a/tests/du/inacc-dest b/tests/du/inacc-dest new file mode 100755 index 000000000..b8bc5ac37 --- /dev/null +++ b/tests/du/inacc-dest @@ -0,0 +1,82 @@ +#!/bin/sh +# Prior to coreutils-6.5, an inaccessible destination dir (chmod a-x) +# would cause du to exit prematurely on systems with native openat 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 + du --version +fi + +. $srcdir/../envvar-check +. $srcdir/../lang-default + +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 f && cd f && mkdir a b c d e && touch c/j && chmod a-x c \ + || framework_failure=1 + +if test $framework_failure = 1; then + echo "$0: failure in testing framework" 1>&2 + (exit 1); exit 1 +fi + +fail=0 + +du > ../t 2>&1 && fail=1 + +# Accept either of the following outputs. +# You get the first from a system with openat _emulation_ (via /proc), +# the second from a system with native openat support. +# FIXME: there may well be a third output, for systems with neither +# /proc support, nor native openat support. + +sed 's/^[0-9][0-9]* //' ../t | sort -u > out +cat <<\EOF > exp || fail=1 +. +./a +./b +./d +./e +du: `./c': Permission denied +EOF + +cat <<\EOF > exp2 || fail=1 +. +./a +./b +./c +./d +./e +du: cannot access `./c/j': Permission denied +EOF + +cmp out exp > /dev/null 2>&1 || { + cmp out exp2 || fail=1 + } +test $fail = 1 && diff out exp 2> /dev/null + +(exit $fail); exit $fail diff --git a/tests/du/no-x b/tests/du/no-x index 61bd07a0f..fa93e97fd 100755 --- a/tests/du/no-x +++ b/tests/du/no-x @@ -55,7 +55,6 @@ EOF # With native fdopendir, du uses a different code path. cat <<\EOF > exp-native-fdopendir du: cannot access `d/no-x/y': Permission denied -du: fts_read failed: Permission denied EOF if cmp out exp >/dev/null 2>&1; then |