diff options
| author | Jim Meyering <meyering@redhat.com> | 2012-03-08 10:33:50 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2012-03-08 13:04:09 +0100 |
| commit | f7f398a1d91ca6b09e5282423711a7c785be2789 (patch) | |
| tree | 0057a3c52fb5cf4369e861b0d6aa1238aecf3b5d /tests | |
| parent | c1d07237a82a9eeebb6911c1ebb63957dac0c148 (diff) | |
| download | coreutils-f7f398a1d91ca6b09e5282423711a7c785be2789.tar.xz | |
du: fix -x: don't ignore non-directory arguments
Surprise! "du -x non-DIR" would print nothing.
Note that the problem arises only when processing a non-directory
specified on the command line. Not surprisingly, "du -x" still
works as expected for any directory argument.
When performing its same-file-system check, du may skip an entry
only if it is at fts_level 1 or greater. Command-line arguments
are at fts_level == 0 (FTS_ROOTLEVEL).
* src/du.c (process_file): Don't use the top-level FTS->fts_dev
when testing for --one-file-system (-x). It happens to be valid
for directories, but it is always 0 for a non-directory.
* tests/du/one-file-system: Add tests for this.
* NEWS (Bug fixes): Mention it.
Reported by Daniel Stavrovski in http://bugs.gnu.org/10967.
Introduced by commit v8.14-95-gcfe1040.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/du/one-file-system | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/du/one-file-system b/tests/du/one-file-system index f0d264ae2..110080f02 100755 --- a/tests/du/one-file-system +++ b/tests/du/one-file-system @@ -43,7 +43,15 @@ compare exp out || fail=1 du -xL d > u || fail=1 sed 's/^[0-9][0-9]* //' u > out1 echo d > exp1 || fail=1 - compare exp1 out1 || fail=1 +# With coreutils-8.15, "du -xs FILE" would print no output. +touch f +for opt in -x -xs; do + du $opt f > u || fail=1 + sed 's/^[0-9][0-9]* //' u > out2 + echo f > exp2 || fail=1 + compare exp2 out2 || fail=1 +done + Exit $fail |