From 77428214f13e1d7b81348fd301a388cb4ce8a2a0 Mon Sep 17 00:00:00 2001 From: "Paul R. Eggert" Date: Sat, 24 Jul 2010 00:19:33 -0700 Subject: du: tune, and fix some -L bugs with dangling or cyclic symlinks * src/du.c (process_file): Avoid recalculation of hashes and of file-exclusion for directories. Do not descend into the same directory more than once, unless -l is given; this is faster. Calculate stat buffer lazily, since it need not be computed at all for excluded files. Count space if FTS_ERR, since stat buffer is always valid then. No need for 'print' local variable. (main): Use FTS_NOSTAT. Use FTS_TIGHT_CYCLE_CHECK only when not hashing everything, since process_file finds cycles on its own when hashing everything. * tests/du/deref: Add test cases for -L bugs. --- tests/du/deref | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'tests/du') diff --git a/tests/du/deref b/tests/du/deref index 79737a6bb..8e4feac3b 100755 --- a/tests/du/deref +++ b/tests/du/deref @@ -1,6 +1,8 @@ #!/bin/sh # prior to coreutils-4.5.3, du -D didn't work in some cases # Based on an example from Andreas Schwab and/or Michal Svec. +# Also, up to coreutils-8.5, du -L sometimes incorrectly +# counted the space of the followed symlinks. # Copyright (C) 2002, 2006-2010 Free Software Foundation, Inc. @@ -27,10 +29,24 @@ fi mkdir -p a/sub || framework_failure ln -s a/sub slink || framework_failure touch b || framework_failure +ln -s .. a/sub/dotdot || framework_failure +ln -s nowhere dangle || framework_failure # This used to fail with the following diagnostic: # du: `b': No such file or directory du -sD slink b > /dev/null 2>&1 || fail=1 +# This used to fail to report the dangling symlink. +du -L dangle > /dev/null 2>&1 && fail=1 + +# du -L used to mess up, either by counting the symlink's disk space itself +# (-L should follow symlinks, not count their space) +# or (briefly in July 2010) by omitting the entry for "a". +du_L_output=`du -L a` || fail=1 +du_lL_output=`du -lL a` || fail=1 +du_x_output=`du --exclude=dotdot a` || fail=1 +test "X$du_L_output" = "X$du_x_output" || fail=1 +test "X$du_lL_output" = "X$du_x_output" || fail=1 + Exit $fail -- cgit v1.2.3-70-g09d2